优化上传

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.Designer.cs

@@ -0,0 +1,562 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_BakingManage
+    {
+        /// <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.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.Container = new System.Windows.Forms.TableLayoutPanel();
+            this.DataBox = new System.Windows.Forms.DataGridView();
+            this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ESTIMATE_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OUT_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.EmployeeVal1 = new System.Windows.Forms.TextBox();
+            this.Choose1 = new System.Windows.Forms.Button();
+            this.EmployeeLab1 = new System.Windows.Forms.Label();
+            this.ReelNoVal1 = new System.Windows.Forms.TextBox();
+            this.ReelNoLab1 = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.EmployeeVal = new System.Windows.Forms.TextBox();
+            this.EmployeeLab = new System.Windows.Forms.Label();
+            this.EstimateLab1 = new System.Windows.Forms.Label();
+            this.EstimateVal = new System.Windows.Forms.TextBox();
+            this.EstimateLab = new System.Windows.Forms.Label();
+            this.Choose = new System.Windows.Forms.Button();
+            this.BackingVal = new System.Windows.Forms.TextBox();
+            this.BackingLab = new System.Windows.Forms.Label();
+            this.ReelNoVal = new System.Windows.Forms.TextBox();
+            this.ReelNoLab = new System.Windows.Forms.Label();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.Container.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
+            this.tableLayoutPanel2.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SNDetails.Location = new System.Drawing.Point(3, 4);
+            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
+            this.SNDetails.TabIndex = 4;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "条码信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 64);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // productName
+            // 
+            this.productName.AutoSize = true;
+            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productName.Location = new System.Drawing.Point(876, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(389, 64);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(628, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(161, 64);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(394, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(147, 64);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(795, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(75, 64);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "物料规格: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 64);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "条码号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(547, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 64);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "物料编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(313, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 64);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "物料名称: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(84, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(223, 64);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // Container
+            // 
+            this.Container.ColumnCount = 1;
+            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.Container.Controls.Add(this.DataBox, 0, 2);
+            this.Container.Controls.Add(this.SNDetails, 0, 0);
+            this.Container.Controls.Add(this.tableLayoutPanel2, 0, 1);
+            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Container.Location = new System.Drawing.Point(0, 0);
+            this.Container.Margin = new System.Windows.Forms.Padding(4);
+            this.Container.Name = "Container";
+            this.Container.RowCount = 3;
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 55F));
+            this.Container.Size = new System.Drawing.Size(1280, 720);
+            this.Container.TabIndex = 9;
+            // 
+            // DataBox
+            // 
+            this.DataBox.AllowUserToAddRows = false;
+            this.DataBox.AllowUserToDeleteRows = false;
+            this.DataBox.BackgroundColor = System.Drawing.SystemColors.Control;
+            this.DataBox.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DataBox.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.BOX_NO,
+            this.REEL_NO,
+            this.IN_DATE,
+            this.ESTIMATE_TIME,
+            this.IN_NAME,
+            this.OUT_NAME});
+            this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.DataBox.Location = new System.Drawing.Point(3, 327);
+            this.DataBox.Name = "DataBox";
+            this.DataBox.ReadOnly = true;
+            this.DataBox.RowHeadersWidth = 62;
+            this.DataBox.RowTemplate.Height = 30;
+            this.DataBox.Size = new System.Drawing.Size(1274, 390);
+            this.DataBox.TabIndex = 155;
+            // 
+            // BOX_NO
+            // 
+            this.BOX_NO.DataPropertyName = "BOX_NO";
+            this.BOX_NO.HeaderText = "烘烤箱号";
+            this.BOX_NO.MinimumWidth = 8;
+            this.BOX_NO.Name = "BOX_NO";
+            this.BOX_NO.ReadOnly = true;
+            this.BOX_NO.Width = 150;
+            // 
+            // REEL_NO
+            // 
+            this.REEL_NO.DataPropertyName = "REEL_NO";
+            this.REEL_NO.HeaderText = "物料条码";
+            this.REEL_NO.MinimumWidth = 8;
+            this.REEL_NO.Name = "REEL_NO";
+            this.REEL_NO.ReadOnly = true;
+            this.REEL_NO.Width = 150;
+            // 
+            // IN_DATE
+            // 
+            this.IN_DATE.DataPropertyName = "IN_DATE";
+            this.IN_DATE.HeaderText = "入烘烤时间";
+            this.IN_DATE.MinimumWidth = 8;
+            this.IN_DATE.Name = "IN_DATE";
+            this.IN_DATE.ReadOnly = true;
+            this.IN_DATE.Width = 150;
+            // 
+            // ESTIMATE_TIME
+            // 
+            this.ESTIMATE_TIME.DataPropertyName = "ESTIMATE_TIME";
+            this.ESTIMATE_TIME.HeaderText = "预计烘烤时长";
+            this.ESTIMATE_TIME.MinimumWidth = 8;
+            this.ESTIMATE_TIME.Name = "ESTIMATE_TIME";
+            this.ESTIMATE_TIME.ReadOnly = true;
+            this.ESTIMATE_TIME.Width = 150;
+            // 
+            // IN_NAME
+            // 
+            this.IN_NAME.DataPropertyName = "IN_NAME";
+            this.IN_NAME.HeaderText = "入烘烤人员";
+            this.IN_NAME.MinimumWidth = 8;
+            this.IN_NAME.Name = "IN_NAME";
+            this.IN_NAME.ReadOnly = true;
+            this.IN_NAME.Width = 150;
+            // 
+            // OUT_NAME
+            // 
+            this.OUT_NAME.DataPropertyName = "OUT_NAME";
+            this.OUT_NAME.HeaderText = "出烘烤人员";
+            this.OUT_NAME.MinimumWidth = 8;
+            this.OUT_NAME.Name = "OUT_NAME";
+            this.OUT_NAME.ReadOnly = true;
+            this.OUT_NAME.Width = 150;
+            // 
+            // tableLayoutPanel2
+            // 
+            this.tableLayoutPanel2.ColumnCount = 2;
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel2.Controls.Add(this.panel2, 1, 0);
+            this.tableLayoutPanel2.Controls.Add(this.panel1, 0, 0);
+            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 111);
+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+            this.tableLayoutPanel2.RowCount = 1;
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(1274, 210);
+            this.tableLayoutPanel2.TabIndex = 156;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.EmployeeVal1);
+            this.panel2.Controls.Add(this.Choose1);
+            this.panel2.Controls.Add(this.EmployeeLab1);
+            this.panel2.Controls.Add(this.ReelNoVal1);
+            this.panel2.Controls.Add(this.ReelNoLab1);
+            this.panel2.Location = new System.Drawing.Point(640, 3);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(631, 204);
+            this.panel2.TabIndex = 177;
+            // 
+            // EmployeeVal1
+            // 
+            this.EmployeeVal1.Location = new System.Drawing.Point(109, 43);
+            this.EmployeeVal1.Name = "EmployeeVal1";
+            this.EmployeeVal1.Size = new System.Drawing.Size(113, 31);
+            this.EmployeeVal1.TabIndex = 180;
+            this.EmployeeVal1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.EmployeeVal1_KeyDown);
+            this.EmployeeVal1.Leave += new System.EventHandler(this.EmployeeVal1_Leave);
+            // 
+            // Choose1
+            // 
+            this.Choose1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Choose1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Choose1.Location = new System.Drawing.Point(370, 88);
+            this.Choose1.Name = "Choose1";
+            this.Choose1.Size = new System.Drawing.Size(90, 30);
+            this.Choose1.TabIndex = 173;
+            this.Choose1.Text = "出烘烤";
+            this.Choose1.UseVisualStyleBackColor = true;
+            this.Choose1.Click += new System.EventHandler(this.Choose1_Click);
+            // 
+            // EmployeeLab1
+            // 
+            this.EmployeeLab1.AutoSize = true;
+            this.EmployeeLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EmployeeLab1.Location = new System.Drawing.Point(25, 43);
+            this.EmployeeLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EmployeeLab1.Name = "EmployeeLab1";
+            this.EmployeeLab1.Size = new System.Drawing.Size(80, 28);
+            this.EmployeeLab1.TabIndex = 179;
+            this.EmployeeLab1.Text = "操作员:";
+            // 
+            // ReelNoVal1
+            // 
+            this.ReelNoVal1.Location = new System.Drawing.Point(110, 90);
+            this.ReelNoVal1.Name = "ReelNoVal1";
+            this.ReelNoVal1.Size = new System.Drawing.Size(243, 31);
+            this.ReelNoVal1.TabIndex = 164;
+            this.ReelNoVal1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ReelNoVal1_KeyDown);
+            this.ReelNoVal1.Leave += new System.EventHandler(this.ReelNoVal1_Leave);
+            // 
+            // ReelNoLab1
+            // 
+            this.ReelNoLab1.AutoSize = true;
+            this.ReelNoLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ReelNoLab1.Location = new System.Drawing.Point(25, 90);
+            this.ReelNoLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ReelNoLab1.Name = "ReelNoLab1";
+            this.ReelNoLab1.Size = new System.Drawing.Size(80, 28);
+            this.ReelNoLab1.TabIndex = 163;
+            this.ReelNoLab1.Text = "条码号:";
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.EmployeeVal);
+            this.panel1.Controls.Add(this.EmployeeLab);
+            this.panel1.Controls.Add(this.EstimateLab1);
+            this.panel1.Controls.Add(this.EstimateVal);
+            this.panel1.Controls.Add(this.EstimateLab);
+            this.panel1.Controls.Add(this.Choose);
+            this.panel1.Controls.Add(this.BackingVal);
+            this.panel1.Controls.Add(this.BackingLab);
+            this.panel1.Controls.Add(this.ReelNoVal);
+            this.panel1.Controls.Add(this.ReelNoLab);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(3, 3);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(631, 204);
+            this.panel1.TabIndex = 136;
+            // 
+            // EmployeeVal
+            // 
+            this.EmployeeVal.Location = new System.Drawing.Point(112, 6);
+            this.EmployeeVal.Name = "EmployeeVal";
+            this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
+            this.EmployeeVal.TabIndex = 178;
+            this.EmployeeVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.EmployeeVal_KeyDown);
+            this.EmployeeVal.Leave += new System.EventHandler(this.EmployeeVal_Leave);
+            // 
+            // EmployeeLab
+            // 
+            this.EmployeeLab.AutoSize = true;
+            this.EmployeeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EmployeeLab.Location = new System.Drawing.Point(28, 6);
+            this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EmployeeLab.Name = "EmployeeLab";
+            this.EmployeeLab.Size = new System.Drawing.Size(80, 28);
+            this.EmployeeLab.TabIndex = 177;
+            this.EmployeeLab.Text = "操作员:";
+            // 
+            // EstimateLab1
+            // 
+            this.EstimateLab1.AutoSize = true;
+            this.EstimateLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EstimateLab1.Location = new System.Drawing.Point(171, 82);
+            this.EstimateLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EstimateLab1.Name = "EstimateLab1";
+            this.EstimateLab1.Size = new System.Drawing.Size(54, 28);
+            this.EstimateLab1.TabIndex = 176;
+            this.EstimateLab1.Text = "小时";
+            // 
+            // EstimateVal
+            // 
+            this.EstimateVal.Location = new System.Drawing.Point(112, 80);
+            this.EstimateVal.Name = "EstimateVal";
+            this.EstimateVal.Size = new System.Drawing.Size(60, 31);
+            this.EstimateVal.TabIndex = 175;
+            this.EstimateVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.EstimateVal_KeyDown);
+            // 
+            // EstimateLab
+            // 
+            this.EstimateLab.AutoSize = true;
+            this.EstimateLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EstimateLab.Location = new System.Drawing.Point(7, 81);
+            this.EstimateLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EstimateLab.Name = "EstimateLab";
+            this.EstimateLab.Size = new System.Drawing.Size(101, 28);
+            this.EstimateLab.TabIndex = 174;
+            this.EstimateLab.Text = "预计时长:";
+            // 
+            // Choose
+            // 
+            this.Choose.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Choose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Choose.Location = new System.Drawing.Point(372, 117);
+            this.Choose.Name = "Choose";
+            this.Choose.Size = new System.Drawing.Size(92, 30);
+            this.Choose.TabIndex = 173;
+            this.Choose.Text = "入烘烤";
+            this.Choose.UseVisualStyleBackColor = true;
+            this.Choose.Click += new System.EventHandler(this.Choose_Click);
+            // 
+            // BackingVal
+            // 
+            this.BackingVal.Location = new System.Drawing.Point(112, 43);
+            this.BackingVal.Name = "BackingVal";
+            this.BackingVal.Size = new System.Drawing.Size(243, 31);
+            this.BackingVal.TabIndex = 166;
+            this.BackingVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BackingVal_KeyDown);
+            // 
+            // BackingLab
+            // 
+            this.BackingLab.AutoSize = true;
+            this.BackingLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BackingLab.Location = new System.Drawing.Point(28, 45);
+            this.BackingLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BackingLab.Name = "BackingLab";
+            this.BackingLab.Size = new System.Drawing.Size(80, 28);
+            this.BackingLab.TabIndex = 165;
+            this.BackingLab.Text = "烘烤箱:";
+            // 
+            // ReelNoVal
+            // 
+            this.ReelNoVal.Location = new System.Drawing.Point(112, 119);
+            this.ReelNoVal.Name = "ReelNoVal";
+            this.ReelNoVal.Size = new System.Drawing.Size(243, 31);
+            this.ReelNoVal.TabIndex = 164;
+            this.ReelNoVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ReelNoVal_KeyDown);
+            this.ReelNoVal.Leave += new System.EventHandler(this.ReelNoVal_Leave);
+            // 
+            // ReelNoLab
+            // 
+            this.ReelNoLab.AutoSize = true;
+            this.ReelNoLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ReelNoLab.Location = new System.Drawing.Point(28, 119);
+            this.ReelNoLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ReelNoLab.Name = "ReelNoLab";
+            this.ReelNoLab.Size = new System.Drawing.Size(80, 28);
+            this.ReelNoLab.TabIndex = 163;
+            this.ReelNoLab.Text = "条码号:";
+            // 
+            // Make_BakingManage
+            // 
+            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(3, 4, 3, 4);
+            this.Name = "Make_BakingManage";
+            this.Text = "Make_InBaking";
+            this.Load += new System.EventHandler(this.Make_InBaking_Load);
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
+            this.Container.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
+            this.tableLayoutPanel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        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.TableLayoutPanel Container;
+        private System.Windows.Forms.DataGridView DataBox;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BOX_NO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn REEL_NO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn IN_DATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ESTIMATE_TIME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn IN_NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OUT_NAME;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button Choose1;
+        private System.Windows.Forms.TextBox ReelNoVal1;
+        private System.Windows.Forms.Label ReelNoLab1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Label EstimateLab1;
+        private System.Windows.Forms.TextBox EstimateVal;
+        private System.Windows.Forms.Label EstimateLab;
+        private System.Windows.Forms.Button Choose;
+        private System.Windows.Forms.TextBox BackingVal;
+        private System.Windows.Forms.Label BackingLab;
+        private System.Windows.Forms.TextBox ReelNoVal;
+        private System.Windows.Forms.Label ReelNoLab;
+        private System.Windows.Forms.TextBox EmployeeVal;
+        private System.Windows.Forms.Label EmployeeLab;
+        private System.Windows.Forms.TextBox EmployeeVal1;
+        private System.Windows.Forms.Label EmployeeLab1;
+    }
+}

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.cs

@@ -0,0 +1,259 @@
+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_BakingManage : Form
+    {
+        public Make_BakingManage()
+        {
+            InitializeComponent();
+        }
+
+        StringBuilder SQL = new StringBuilder();
+        DataHelper dh = SystemInf.dh;
+        DataTable dt;
+
+        private void Make_InBaking_Load(object sender, EventArgs e)
+        {
+            LoadBaking();
+
+            Timer ReLoad = new Timer();
+            ReLoad.Interval = 10000;
+            ReLoad.Tick += ReLoadData;
+            ReLoad.Start();
+
+        }
+
+        private void ReLoadData(object sender, EventArgs e)
+        {
+            LoadBaking();
+        }
+        private void ReelNoVal_Leave(object sender, EventArgs e)
+        {
+            UpdateMaterial("L", ReelNoVal.Text);
+        }
+
+        private void ReelNoVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            ReelNoVal.Text = ReelNoVal.Text.Trim();
+
+            UpdateMaterial("L", ReelNoVal.Text);
+        }
+
+        private void LoadBaking()
+        {
+            dt = (DataTable)dh.ExecuteSql($"SELECT box_no,reel_no,in_date,in_name,estimate_time FROM baking_log WHERE status = '烘烤中'", "select");
+            DataBox.DataSource = dt;
+        }
+
+        private void UpdateMaterial(string type, string reelNo = "")
+        {
+            if (type == "C")
+            {
+                serialNumber.Text = "";
+                workOrder.Text = "";
+                productCode.Text = "";
+                productName.Text = "";
+            }
+            else if (type == "L")
+            {
+                dt = (DataTable)dh.ExecuteSql($@"SELECT bar_code,bar_prodcode,pr_detail,pr_spec,bar_batchqty
+                    FROM barcode LEFT JOIN product ON pr_code = bar_prodcode WHERE bar_code = '{reelNo}'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    serialNumber.Text = dt.Rows[0]["bar_code"].ToString();
+                    workOrder.Text = dt.Rows[0]["pr_detail"].ToString();
+                    productCode.Text = dt.Rows[0]["bar_prodcode"].ToString();
+                    productName.Text = dt.Rows[0]["pr_spec"].ToString();
+                }
+                else
+                {
+                    UpdateMaterial("C");
+                }
+            }
+        }
+
+        private void Choose_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(EmployeeVal.Text))
+            {
+                MessageBox.Show("请输入烘烤操作员账号");
+                return;
+            }
+
+            if (string.IsNullOrEmpty(BackingVal.Text))
+            {
+                MessageBox.Show("请扫描烘烤箱号");
+                return;
+            }
+            if (string.IsNullOrEmpty(EstimateVal.Text))
+            {
+                MessageBox.Show("请填写扫描时长");
+                return;
+            }
+            if (string.IsNullOrEmpty(ReelNoVal.Text))
+            {
+                MessageBox.Show("请扫描入烘烤物料条码");
+                return;
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM baking_log WHERE status = '烘烤中' AND reel_no = '{ReelNoVal.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                MessageBox.Show($"条码号:{ReelNoVal.Text} 已在烘烤箱中");
+                return;
+            }
+
+            dh.ExecuteSql($@"INSERT INTO baking_log (baking_id,box_no,reel_no,status,in_date,in_name,estimate_time)
+                SELECT baking_log_seq.NEXTVAL,'{BackingVal.Text}', '{ReelNoVal.Text}', '烘烤中',sysdate,'{EmployeeVal.Text.Trim()}','{EstimateVal.Text}' FROM dual", "insert");
+
+            EmployeeVal.Text = "";
+            BackingVal.Text = "";
+            EstimateVal.Text = "";
+            ReelNoVal.Text = "";
+            UpdateMaterial("C");
+            LoadBaking();
+            MessageBox.Show($"条码号:{ReelNoVal.Text} 入烘烤箱成功");
+        }
+
+        private void BackingVal_KeyDown(object sender, KeyEventArgs e)
+        {
+
+            if (e.KeyCode != Keys.Enter) return;
+
+            BackingVal.Text = BackingVal.Text.Trim();
+
+            EstimateVal.Focus();
+            EstimateVal.SelectAll();
+        }
+
+        private void EstimateVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            EstimateVal.Text = EstimateVal.Text.Trim();
+
+            ReelNoVal.Focus();
+            ReelNoVal.SelectAll();
+        }
+
+        private void EmployeeVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(EmployeeVal.Text)) return;
+
+            dt = (DataTable)dh.ExecuteSql($"select * from employee where em_code = '{EmployeeVal.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("请输入正确人员账号");
+                EmployeeVal.Text = "";
+                EmployeeVal.Focus();
+                EmployeeVal.SelectAll();
+                return;
+            }
+        }
+
+        private void EmployeeVal_Leave(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(EmployeeVal.Text)) return;
+
+            dt = (DataTable)dh.ExecuteSql($"select * from employee where em_code = '{EmployeeVal.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("请输入正确人员账号");
+                EmployeeVal.Text = "";
+                EmployeeVal.Focus();
+                EmployeeVal.SelectAll();
+                return;
+            }
+        }
+
+        private void EmployeeVal1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(EmployeeVal1.Text)) return;
+
+            dt = (DataTable)dh.ExecuteSql($"select * from employee where em_code = '{EmployeeVal1.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("请输入正确人员账号");
+                EmployeeVal1.Text = "";
+                EmployeeVal1.Focus();
+                EmployeeVal1.SelectAll();
+                return;
+            }
+        }
+
+        private void EmployeeVal1_Leave(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(EmployeeVal1.Text)) return;
+
+            dt = (DataTable)dh.ExecuteSql($"select * from employee where em_code = '{EmployeeVal1.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("请输入正确人员账号");
+                EmployeeVal1.Text = "";
+                EmployeeVal1.Focus();
+                EmployeeVal1.SelectAll();
+                return;
+            }
+        }
+
+        private void Choose1_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(EmployeeVal1.Text))
+            {
+                MessageBox.Show("请输入烘烤操作员账号");
+                return;
+            }
+            if (string.IsNullOrEmpty(ReelNoVal1.Text))
+            {
+                MessageBox.Show("请扫描入烘烤物料条码");
+                return;
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM baking_log WHERE status = '烘烤中' AND reel_no = '{ReelNoVal1.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show($"条码号:{ReelNoVal1.Text} 不在烘烤箱中，请重试");
+                ReelNoVal1.Focus();
+                ReelNoVal1.SelectAll();
+                return;
+            }
+
+            dh.ExecuteSql($@"UPDATE baking_log SET status = '已烘烤',out_date = sysdate,baking_time = TRUNC(sysdate - in_date),out_name = '{EmployeeVal1.Text.Trim()}' WHERE status = '烘烤中' and reel_no = '{ReelNoVal1.Text.Trim()}'", "insert");
+            EmployeeVal1.Text = "";
+            ReelNoVal1.Text = "";
+            UpdateMaterial("C");
+            LoadBaking();
+            MessageBox.Show($"条码号:{ReelNoVal1.Text} 出烘烤箱成功");
+        }
+
+        private void ReelNoVal1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            ReelNoVal1.Text = ReelNoVal1.Text.Trim();
+
+            UpdateMaterial("L", ReelNoVal1.Text);
+        }
+
+        private void ReelNoVal1_Leave(object sender, EventArgs e)
+        {
+            UpdateMaterial("L", ReelNoVal1.Text);
+        }
+    }
+}

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.resx

@@ -0,0 +1,156 @@
+<?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="BOX_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="REEL_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IN_DATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ESTIMATE_TIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IN_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="OUT_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="BOX_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="REEL_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IN_DATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ESTIMATE_TIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="IN_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="OUT_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -41,10 +41,13 @@
             this.TopBox = new System.Windows.Forms.Panel();
             this.BurnLotnoVal = new System.Windows.Forms.TextBox();
             this.BurnLotnoLab = new System.Windows.Forms.Label();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.DataBox = new System.Windows.Forms.DataGridView();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.RightBox = new System.Windows.Forms.Panel();
             this.ClearMsg = new System.Windows.Forms.Button();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -53,6 +56,10 @@
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PrdetailLab = new System.Windows.Forms.Label();
+            this.pr_spec = new System.Windows.Forms.TextBox();
+            this.ma_qty = new System.Windows.Forms.TextBox();
+            this.TargetQtyLab = new System.Windows.Forms.Label();
             this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -61,9 +68,6 @@
             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();
@@ -74,7 +78,7 @@
             // 
             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.Location = new System.Drawing.Point(26, 30);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(96, 28);
@@ -85,24 +89,26 @@
             // 
             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.Location = new System.Drawing.Point(395, 75);
             this.LineLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.LineLab.Name = "LineLab";
             this.LineLab.Size = new System.Drawing.Size(54, 28);
             this.LineLab.TabIndex = 144;
             this.LineLab.Text = "线体";
+            this.LineLab.Visible = false;
             // 
             // LineVal
             // 
             this.LineVal.FormattingEnabled = true;
-            this.LineVal.Location = new System.Drawing.Point(458, 32);
+            this.LineVal.Location = new System.Drawing.Point(463, 75);
             this.LineVal.Name = "LineVal";
             this.LineVal.Size = new System.Drawing.Size(243, 32);
             this.LineVal.TabIndex = 145;
+            this.LineVal.Visible = false;
             // 
             // BurnSwVal
             // 
-            this.BurnSwVal.Location = new System.Drawing.Point(90, 102);
+            this.BurnSwVal.Location = new System.Drawing.Point(91, 122);
             this.BurnSwVal.Multiline = true;
             this.BurnSwVal.Name = "BurnSwVal";
             this.BurnSwVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -114,7 +120,7 @@
             // 
             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.Location = new System.Drawing.Point(26, 133);
             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);
@@ -125,7 +131,7 @@
             // 
             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.Location = new System.Drawing.Point(395, 133);
             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);
@@ -136,7 +142,7 @@
             // 
             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.Location = new System.Drawing.Point(712, 133);
             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);
@@ -145,7 +151,7 @@
             // 
             // CheckCodeVal
             // 
-            this.CheckCodeVal.Location = new System.Drawing.Point(458, 102);
+            this.CheckCodeVal.Location = new System.Drawing.Point(462, 122);
             this.CheckCodeVal.Multiline = true;
             this.CheckCodeVal.Name = "CheckCodeVal";
             this.CheckCodeVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -155,7 +161,7 @@
             // 
             // DotVal
             // 
-            this.DotVal.Location = new System.Drawing.Point(780, 99);
+            this.DotVal.Location = new System.Drawing.Point(777, 122);
             this.DotVal.Multiline = true;
             this.DotVal.Name = "DotVal";
             this.DotVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
@@ -166,7 +172,7 @@
             // Confirm
             // 
             this.Confirm.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Confirm.Location = new System.Drawing.Point(1054, 111);
+            this.Confirm.Location = new System.Drawing.Point(1054, 141);
             this.Confirm.Name = "Confirm";
             this.Confirm.Size = new System.Drawing.Size(81, 28);
             this.Confirm.TabIndex = 152;
@@ -176,6 +182,10 @@
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.ma_qty);
+            this.TopBox.Controls.Add(this.TargetQtyLab);
+            this.TopBox.Controls.Add(this.pr_spec);
+            this.TopBox.Controls.Add(this.PrdetailLab);
             this.TopBox.Controls.Add(this.BurnLotnoVal);
             this.TopBox.Controls.Add(this.BurnLotnoLab);
             this.TopBox.Controls.Add(this.LineLab);
@@ -193,12 +203,12 @@
             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.Size = new System.Drawing.Size(1280, 201);
             this.TopBox.TabIndex = 153;
             // 
             // BurnLotnoVal
             // 
-            this.BurnLotnoVal.Location = new System.Drawing.Point(780, 32);
+            this.BurnLotnoVal.Location = new System.Drawing.Point(91, 75);
             this.BurnLotnoVal.Name = "BurnLotnoVal";
             this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
             this.BurnLotnoVal.TabIndex = 155;
@@ -208,12 +218,43 @@
             // 
             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.Location = new System.Drawing.Point(26, 75);
             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 = "烧录批次";
+            this.BurnLotnoLab.Text = "条码扫描";
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(310, 32);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 153;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(91, 30);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(205, 32);
+            this.ma_code.TabIndex = 143;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
             // 
             // DataBox
             // 
@@ -237,7 +278,7 @@
             this.DataBox.ReadOnly = true;
             this.DataBox.RowHeadersWidth = 62;
             this.DataBox.RowTemplate.Height = 30;
-            this.DataBox.Size = new System.Drawing.Size(890, 522);
+            this.DataBox.Size = new System.Drawing.Size(890, 513);
             this.DataBox.TabIndex = 154;
             // 
             // tableLayoutPanel1
@@ -248,12 +289,12 @@
             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.Location = new System.Drawing.Point(0, 201);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 1;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 528F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 528);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 519);
             this.tableLayoutPanel1.TabIndex = 156;
             // 
             // RightBox
@@ -263,7 +304,7 @@
             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.Size = new System.Drawing.Size(378, 513);
             this.RightBox.TabIndex = 156;
             // 
             // ClearMsg
@@ -279,6 +320,18 @@
             this.ClearMsg.UseVisualStyleBackColor = true;
             this.ClearMsg.Click += new System.EventHandler(this.ClearMsg_Click);
             // 
+            // OperateResult
+            // 
+            this.OperateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 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 = "";
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "work_order";
@@ -351,6 +404,44 @@
             this.dataGridViewTextBoxColumn8.ReadOnly = true;
             this.dataGridViewTextBoxColumn8.Width = 150;
             // 
+            // PrdetailLab
+            // 
+            this.PrdetailLab.AutoSize = true;
+            this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PrdetailLab.Location = new System.Drawing.Point(541, 30);
+            this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrdetailLab.Name = "PrdetailLab";
+            this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
+            this.PrdetailLab.TabIndex = 156;
+            this.PrdetailLab.Text = "机型信息 ";
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.Enabled = false;
+            this.pr_spec.Location = new System.Drawing.Point(610, 30);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Size = new System.Drawing.Size(429, 31);
+            this.pr_spec.TabIndex = 157;
+            // 
+            // ma_qty
+            // 
+            this.ma_qty.Enabled = false;
+            this.ma_qty.Location = new System.Drawing.Point(463, 30);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(61, 31);
+            this.ma_qty.TabIndex = 159;
+            // 
+            // TargetQtyLab
+            // 
+            this.TargetQtyLab.AutoSize = true;
+            this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TargetQtyLab.Location = new System.Drawing.Point(395, 30);
+            this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TargetQtyLab.Name = "TargetQtyLab";
+            this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
+            this.TargetQtyLab.TabIndex = 158;
+            this.TargetQtyLab.Text = "工单数量";
+            // 
             // work_order
             // 
             this.work_order.DataPropertyName = "work_order";
@@ -376,6 +467,7 @@
             this.line.MinimumWidth = 8;
             this.line.Name = "line";
             this.line.ReadOnly = true;
+            this.line.Visible = false;
             this.line.Width = 150;
             // 
             // burn_software
@@ -423,49 +515,6 @@
             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);
@@ -508,14 +557,6 @@
         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;
@@ -526,5 +567,17 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
         private System.Windows.Forms.Button ClearMsg;
+        private System.Windows.Forms.Label PrdetailLab;
+        private System.Windows.Forms.TextBox pr_spec;
+        private System.Windows.Forms.TextBox ma_qty;
+        private System.Windows.Forms.Label TargetQtyLab;
+        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;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -58,8 +58,8 @@ namespace UAS_MES_NEW.Make
             //获取工单的其他信息
             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 + "'");
+            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,ma_qty from make left join makecraftdetail on ");
+            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
@@ -81,13 +81,13 @@ namespace UAS_MES_NEW.Make
                 ma_code.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(LineVal.Text))
+            /*if (string.IsNullOrEmpty(LineVal.Text))
             {
                 ShowMsg(0, "请选择线体");
                 LineVal.Focus();
                 LineVal.SelectAll();
                 return;
-            }
+            }*/
             if (string.IsNullOrEmpty(BurnLotnoVal.Text))
             {
                 ShowMsg(0, "请扫描包批次号");

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

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

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.Designer.cs

@@ -30,10 +30,7 @@
         {
             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();
@@ -49,9 +46,6 @@
             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();
@@ -62,6 +56,13 @@
             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.panel4 = new System.Windows.Forms.Panel();
+            this.BurnLotnoVal = new System.Windows.Forms.TextBox();
+            this.BurnLotnoLab = new System.Windows.Forms.Label();
+            this.ma_qty = new System.Windows.Forms.TextBox();
+            this.TargetQtyLab = new System.Windows.Forms.Label();
+            this.pr_spec = new System.Windows.Forms.TextBox();
+            this.PrdetailLab = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -72,10 +73,11 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.Query);
-            this.panel1.Controls.Add(this.LineLab);
+            this.panel1.Controls.Add(this.ma_qty);
+            this.panel1.Controls.Add(this.TargetQtyLab);
+            this.panel1.Controls.Add(this.pr_spec);
+            this.panel1.Controls.Add(this.PrdetailLab);
             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;
@@ -85,28 +87,6 @@
             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;
@@ -119,14 +99,6 @@
             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;
@@ -332,38 +304,6 @@
             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";
@@ -444,6 +384,7 @@
             this.inspect_time.MinimumWidth = 8;
             this.inspect_time.Name = "inspect_time";
             this.inspect_time.ReadOnly = true;
+            this.inspect_time.Width = 150;
             // 
             // inspect_name
             // 
@@ -454,6 +395,76 @@
             this.inspect_name.ReadOnly = true;
             this.inspect_name.Width = 80;
             // 
+            // 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 = "烧录批次";
+            // 
+            // ma_qty
+            // 
+            this.ma_qty.Enabled = false;
+            this.ma_qty.Location = new System.Drawing.Point(444, 21);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(61, 31);
+            this.ma_qty.TabIndex = 164;
+            // 
+            // TargetQtyLab
+            // 
+            this.TargetQtyLab.AutoSize = true;
+            this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TargetQtyLab.Location = new System.Drawing.Point(376, 21);
+            this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TargetQtyLab.Name = "TargetQtyLab";
+            this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
+            this.TargetQtyLab.TabIndex = 163;
+            this.TargetQtyLab.Text = "工单数量";
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.Enabled = false;
+            this.pr_spec.Location = new System.Drawing.Point(590, 21);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Size = new System.Drawing.Size(429, 31);
+            this.pr_spec.TabIndex = 162;
+            // 
+            // PrdetailLab
+            // 
+            this.PrdetailLab.AutoSize = true;
+            this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PrdetailLab.Location = new System.Drawing.Point(522, 21);
+            this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrdetailLab.Name = "PrdetailLab";
+            this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
+            this.PrdetailLab.TabIndex = 161;
+            this.PrdetailLab.Text = "机型信息 ";
+            // 
             // Make_BurnInspection
             // 
             this.AllowDrop = true;
@@ -496,14 +507,11 @@
         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;
@@ -514,5 +522,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dot_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn inspect_time;
         private System.Windows.Forms.DataGridViewTextBoxColumn inspect_name;
+        private System.Windows.Forms.TextBox ma_qty;
+        private System.Windows.Forms.Label TargetQtyLab;
+        private System.Windows.Forms.TextBox pr_spec;
+        private System.Windows.Forms.Label PrdetailLab;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.cs

@@ -61,13 +61,29 @@ namespace UAS_MES_NEW.Make
             //获取工单的其他信息
             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 + "'");
+            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,ma_qty from make left join makecraftdetail on ");
+            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
                 BaseUtil.SetFormValue(this.Controls, dt);
             }
+
+            SQL.Clear();
+            if (!string.IsNullOrEmpty(ma_code.Text))
+            {
+                SQL.Append($"AND a.work_order = '{ma_code.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 ClearMsg_Click(object sender, EventArgs e)
@@ -136,37 +152,6 @@ namespace UAS_MES_NEW.Make
             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");

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.resx

@@ -224,4 +224,34 @@
   <metadata name="inspect_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <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>

UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.Designer.cs

@@ -31,6 +31,15 @@
             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.EmployeeVal = new System.Windows.Forms.TextBox();
+            this.EmployeeLab = 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.LineLab = new System.Windows.Forms.Label();
             this.LineVal = new System.Windows.Forms.ComboBox();
             this.OK = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
@@ -40,6 +49,8 @@
             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.TargetQty = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
             this.productName = new System.Windows.Forms.Label();
             this.productCode = new System.Windows.Forms.Label();
             this.workOrder = new System.Windows.Forms.Label();
@@ -48,13 +59,6 @@
             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();
@@ -73,14 +77,16 @@
             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, 15F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
             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.EmployeeVal);
+            this.panel1.Controls.Add(this.EmployeeLab);
             this.panel1.Controls.Add(this.onWatch);
             this.panel1.Controls.Add(this.allParse);
             this.panel1.Controls.Add(this.Device);
@@ -95,16 +101,117 @@
             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.Location = new System.Drawing.Point(3, 111);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1274, 210);
+            this.panel1.Size = new System.Drawing.Size(1274, 174);
             this.panel1.TabIndex = 4;
             // 
+            // EmployeeVal
+            // 
+            this.EmployeeVal.Location = new System.Drawing.Point(101, 24);
+            this.EmployeeVal.Name = "EmployeeVal";
+            this.EmployeeVal.Size = new System.Drawing.Size(103, 31);
+            this.EmployeeVal.TabIndex = 177;
+            this.EmployeeVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.EmployeeVal_KeyDown_1);
+            this.EmployeeVal.Leave += new System.EventHandler(this.EmployeeVal_Leave_1);
+            // 
+            // EmployeeLab
+            // 
+            this.EmployeeLab.AutoSize = true;
+            this.EmployeeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EmployeeLab.Location = new System.Drawing.Point(39, 24);
+            this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EmployeeLab.Name = "EmployeeLab";
+            this.EmployeeLab.Size = new System.Drawing.Size(75, 28);
+            this.EmployeeLab.TabIndex = 176;
+            this.EmployeeLab.Text = "抽检员";
+            // 
+            // onWatch
+            // 
+            this.onWatch.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.onWatch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.onWatch.Location = new System.Drawing.Point(792, 102);
+            this.onWatch.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;
+            // 
             // 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.Location = new System.Drawing.Point(49, 61);
             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);
@@ -114,9 +221,9 @@
             // LineVal
             // 
             this.LineVal.FormattingEnabled = true;
-            this.LineVal.Location = new System.Drawing.Point(121, 33);
+            this.LineVal.Location = new System.Drawing.Point(101, 61);
             this.LineVal.Name = "LineVal";
-            this.LineVal.Size = new System.Drawing.Size(243, 32);
+            this.LineVal.Size = new System.Drawing.Size(164, 32);
             this.LineVal.TabIndex = 168;
             // 
             // OK
@@ -129,7 +236,7 @@
             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.Location = new System.Drawing.Point(400, 86);
             this.OK.Margin = new System.Windows.Forms.Padding(5);
             this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
             this.OK.Name = "OK";
@@ -152,7 +259,7 @@
             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.Location = new System.Drawing.Point(566, 86);
             this.NG.Margin = new System.Windows.Forms.Padding(5);
             this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
             this.NG.Name = "NG";
@@ -167,7 +274,7 @@
             // 
             // SNVal
             // 
-            this.SNVal.Location = new System.Drawing.Point(121, 103);
+            this.SNVal.Location = new System.Drawing.Point(101, 99);
             this.SNVal.Name = "SNVal";
             this.SNVal.Size = new System.Drawing.Size(243, 31);
             this.SNVal.TabIndex = 164;
@@ -176,7 +283,7 @@
             // 
             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.Location = new System.Drawing.Point(39, 99);
             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);
@@ -203,7 +310,7 @@
             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.Size = new System.Drawing.Size(1274, 102);
             this.SNDetails.TabIndex = 3;
             this.SNDetails.TabStop = false;
             this.SNDetails.Text = "产品序列信息";
@@ -211,15 +318,19 @@
             // 
             // 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.ColumnCount = 10;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 5.263158F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.52632F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 5.263158F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.52632F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 5.263158F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.52632F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 5.263158F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 31.57895F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 5.263158F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.52632F));
+            this.tableLayoutPanel1.Controls.Add(this.TargetQty, 9, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label7, 8, 0);
             this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
             this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
             this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
@@ -233,17 +344,37 @@
             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.Size = new System.Drawing.Size(1268, 68);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
+            // TargetQty
+            // 
+            this.TargetQty.AutoSize = true;
+            this.TargetQty.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TargetQty.Location = new System.Drawing.Point(1132, 0);
+            this.TargetQty.Name = "TargetQty";
+            this.TargetQty.Size = new System.Drawing.Size(133, 68);
+            this.TargetQty.TabIndex = 9;
+            this.TargetQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label7.Location = new System.Drawing.Point(1066, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(60, 68);
+            this.label7.TabIndex = 8;
+            this.label7.Text = "工单数量: ";
+            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // productName
             // 
             this.productName.AutoSize = true;
             this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productName.Location = new System.Drawing.Point(800, 0);
+            this.productName.Location = new System.Drawing.Point(666, 0);
             this.productName.Name = "productName";
-            this.productName.Size = new System.Drawing.Size(465, 32);
+            this.productName.Size = new System.Drawing.Size(394, 68);
             this.productName.TabIndex = 7;
             this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -251,9 +382,9 @@
             // 
             this.productCode.AutoSize = true;
             this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productCode.Location = new System.Drawing.Point(552, 0);
+            this.productCode.Location = new System.Drawing.Point(467, 0);
             this.productCode.Name = "productCode";
-            this.productCode.Size = new System.Drawing.Size(161, 32);
+            this.productCode.Size = new System.Drawing.Size(127, 68);
             this.productCode.TabIndex = 6;
             this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -261,9 +392,9 @@
             // 
             this.workOrder.AutoSize = true;
             this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.workOrder.Location = new System.Drawing.Point(318, 0);
+            this.workOrder.Location = new System.Drawing.Point(268, 0);
             this.workOrder.Name = "workOrder";
-            this.workOrder.Size = new System.Drawing.Size(147, 32);
+            this.workOrder.Size = new System.Drawing.Size(127, 68);
             this.workOrder.TabIndex = 5;
             this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
@@ -271,9 +402,9 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(719, 0);
+            this.label4.Location = new System.Drawing.Point(600, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(75, 32);
+            this.label4.Size = new System.Drawing.Size(60, 68);
             this.label4.TabIndex = 3;
             this.label4.Text = "产品名称: ";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -284,7 +415,7 @@
             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.Size = new System.Drawing.Size(60, 68);
             this.label1.TabIndex = 0;
             this.label1.Text = "序列号: ";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -293,9 +424,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(471, 0);
+            this.label3.Location = new System.Drawing.Point(401, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(75, 32);
+            this.label3.Size = new System.Drawing.Size(60, 68);
             this.label3.TabIndex = 2;
             this.label3.Text = "产品编号: ";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -304,9 +435,9 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(237, 0);
+            this.label2.Location = new System.Drawing.Point(202, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(75, 32);
+            this.label2.Size = new System.Drawing.Size(60, 68);
             this.label2.TabIndex = 1;
             this.label2.Text = "工单: ";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -315,93 +446,12 @@
             // 
             this.serialNumber.AutoSize = true;
             this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.serialNumber.Location = new System.Drawing.Point(84, 0);
+            this.serialNumber.Location = new System.Drawing.Point(69, 0);
             this.serialNumber.Name = "serialNumber";
-            this.serialNumber.Size = new System.Drawing.Size(147, 32);
+            this.serialNumber.Size = new System.Drawing.Size(127, 68);
             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);
@@ -451,5 +501,9 @@
         private System.Windows.Forms.Button Choose;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.TextBox txtPath;
+        private System.Windows.Forms.TextBox EmployeeVal;
+        private System.Windows.Forms.Label EmployeeLab;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label TargetQty;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.cs

@@ -36,6 +36,12 @@ namespace UAS_MES_NEW.Make
 
         private void OK_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(EmployeeVal.Text))
+            {
+                ShowMsg(0, "请输入抽检人员账号");
+                return;
+            }
+
             if (string.IsNullOrEmpty(LineVal.Text))
             {
                 ShowMsg(0, "请选择线体");
@@ -53,6 +59,12 @@ namespace UAS_MES_NEW.Make
 
         private void NG_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(EmployeeVal.Text))
+            {
+                ShowMsg(0, "请输入抽检人员账号");
+                return;
+            }
+
             if (string.IsNullOrEmpty(LineVal.Text))
             {
                 ShowMsg(0, "请选择线体");
@@ -108,11 +120,12 @@ namespace UAS_MES_NEW.Make
                 workOrder.Text = "";
                 productCode.Text = "";
                 productName.Text = "";
+                TargetQty.Text = "";
             }
             else if (type == "L")
             {
                 SQL.Clear();
-                SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product
+                SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec,ma_qty 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)
@@ -121,6 +134,7 @@ namespace UAS_MES_NEW.Make
                     workOrder.Text = dt.Rows[0]["ma_code"].ToString();
                     productCode.Text = dt.Rows[0]["pr_code"].ToString();
                     productName.Text = dt.Rows[0]["pr_spec"].ToString();
+                    TargetQty.Text = dt.Rows[0]["ma_qty"].ToString();
                 }
                 else
                 {
@@ -129,6 +143,37 @@ namespace UAS_MES_NEW.Make
             }
         }
 
+        private void EmployeeVal_KeyDown_1(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(EmployeeVal.Text)) return;
+
+            dt = (DataTable)dh.ExecuteSql($"select * from employee where em_code = '{EmployeeVal.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("请输入正确人员账号");
+                EmployeeVal.Text = "";
+                EmployeeVal.Focus();
+                EmployeeVal.SelectAll();
+                return;
+            }
+        }
+
+        private void EmployeeVal_Leave_1(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(EmployeeVal.Text)) return;
+
+            dt = (DataTable)dh.ExecuteSql($"select * from employee where em_code = '{EmployeeVal.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("请输入正确人员账号");
+                EmployeeVal.Text = "";
+                EmployeeVal.Focus();
+                EmployeeVal.SelectAll();
+                return;
+            }
+        }
     }
 }
 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.Designer.cs

@@ -126,7 +126,7 @@
             this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
-            this.RadioReceive.Text = "领用";
+            this.RadioReceive.Text = "上线";
             this.RadioReceive.UseVisualStyleBackColor = true;
             this.RadioReceive.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -140,7 +140,7 @@
             this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
-            this.RadioReturn.Text = "退回";
+            this.RadioReturn.Text = "下线";
             this.RadioReturn.UseVisualStyleBackColor = true;
             this.RadioReturn.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -535,7 +535,7 @@
             this.Receive.Power = null;
             this.Receive.Size = new System.Drawing.Size(102, 42);
             this.Receive.TabIndex = 104;
-            this.Receive.Text = "领用";
+            this.Receive.Text = "上线";
             this.Receive.UseVisualStyleBackColor = false;
             this.Receive.Click += new System.EventHandler(this.Receive_Click);
             // 
@@ -554,7 +554,7 @@
             this.Return.Power = null;
             this.Return.Size = new System.Drawing.Size(102, 42);
             this.Return.TabIndex = 103;
-            this.Return.Text = "退回";
+            this.Return.Text = "下线";
             this.Return.UseVisualStyleBackColor = false;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -168,13 +168,13 @@ namespace UAS_MES_NEW.Make
                     {
                         string em_name = dt.Rows[0]["em_name"].ToString();
                         sql.Clear();
-                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
+                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS,su_indate)");
                         sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',ST_CLEANNUMS,st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + em_code.Text + "','" + st_table.Text + "','" + ma_code.Text + "'");
-                        sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'在线' from ");
+                        sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
                         sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                         dh.ExecuteSql(sql.ToString(), "insert");
                         dh.ExecuteSql("update Stencil set ST_USESTATUS='在线' where st_code='" + SU_DEVCODE.Text + "'", "update");
-                        MessageBox.Show("领用成功");
+                        MessageBox.Show("上线成功");
                         st_table.SelectedItem = null;
                         SU_DEVCODE.Text = "";
                         em_code.Text = "";
@@ -234,10 +234,10 @@ namespace UAS_MES_NEW.Make
                     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,
+                    sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
                             su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
-                            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")}'
+                            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()}',sysdate,'{dt.Rows[0]["em_name"].ToString()}',
+                            '{(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");
 
@@ -246,7 +246,7 @@ namespace UAS_MES_NEW.Make
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
 
 
-                    MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "退回成功！");
+                    MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "下线成功！");
                         SU_DEVCODE1.Text = "";
                         st_combinenumber.Text = "";
                         em_code1.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.resx

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

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -126,7 +126,7 @@
             this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
-            this.RadioReceive.Text = "领用";
+            this.RadioReceive.Text = "上线";
             this.RadioReceive.UseVisualStyleBackColor = true;
             this.RadioReceive.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -140,7 +140,7 @@
             this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
-            this.RadioReturn.Text = "退回";
+            this.RadioReturn.Text = "下线";
             this.RadioReturn.UseVisualStyleBackColor = true;
             this.RadioReturn.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -304,7 +304,7 @@
             this.Receive.Power = null;
             this.Receive.Size = new System.Drawing.Size(102, 42);
             this.Receive.TabIndex = 104;
-            this.Receive.Text = "领用";
+            this.Receive.Text = "上线";
             this.Receive.UseVisualStyleBackColor = false;
             this.Receive.Click += new System.EventHandler(this.Receive_Click);
             // 
@@ -323,7 +323,7 @@
             this.Return.Power = null;
             this.Return.Size = new System.Drawing.Size(102, 42);
             this.Return.TabIndex = 103;
-            this.Return.Text = "退回";
+            this.Return.Text = "下线";
             this.Return.UseVisualStyleBackColor = false;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -168,13 +168,13 @@ namespace UAS_MES_NEW.Make
                     {
                         string em_name = dt.Rows[0]["em_name"].ToString();
                         sql.Clear();
-                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
+                        sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS,su_indate)");
                         sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',ST_CLEANNUMS,st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + em_code.Text + "','" + st_table.Text + "','" + ma_code.Text + "'");
-                        sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'在线' from ");
+                        sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
                         sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
                         dh.ExecuteSql(sql.ToString(), "insert");
                         dh.ExecuteSql("update Stencil set ST_USESTATUS='在线' where st_code='" + SU_DEVCODE.Text + "'", "update");
-                        MessageBox.Show("领用成功");
+                        MessageBox.Show("上线成功");
                         st_table.SelectedItem = null;
                         SU_DEVCODE.Text = "";
                         em_code.Text = "";
@@ -236,10 +236,10 @@ namespace UAS_MES_NEW.Make
 
 
                         sql.Clear();
-                        sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,
+                        sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
                             su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
-                            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")}'
+                            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()}',sysdate,'{dt.Rows[0]["em_name"].ToString()}',
+                            '{(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");
 
@@ -247,7 +247,7 @@ namespace UAS_MES_NEW.Make
                             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 + "退回成功！");
+                        MessageBox.Show("钢网" + SU_DEVCODE1.Text + "下线成功！");
                         SU_DEVCODE1.Text = "";
                         st_combinenumber.Text = "";
                         em_code1.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.resx

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

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.Designer.cs

@@ -81,7 +81,7 @@
             this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
-            this.RadioReceive.Text = "领用";
+            this.RadioReceive.Text = "出库";
             this.RadioReceive.UseVisualStyleBackColor = true;
             this.RadioReceive.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -95,7 +95,7 @@
             this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
-            this.RadioReturn.Text = "退回";
+            this.RadioReturn.Text = "回库";
             this.RadioReturn.UseVisualStyleBackColor = true;
             this.RadioReturn.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -286,7 +286,7 @@
             this.Receive.Power = null;
             this.Receive.Size = new System.Drawing.Size(102, 42);
             this.Receive.TabIndex = 104;
-            this.Receive.Text = "领用";
+            this.Receive.Text = "出库";
             this.Receive.UseVisualStyleBackColor = false;
             this.Receive.Click += new System.EventHandler(this.Receive_Click);
             // 
@@ -306,7 +306,7 @@
             this.Return.Size = new System.Drawing.Size(102, 42);
             this.Return.TabIndex = 103;
             this.Return.Tag = "Make!SMTStockStencil";
-            this.Return.Text = "退回";
+            this.Return.Text = "回库";
             this.Return.UseVisualStyleBackColor = false;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.cs

@@ -114,14 +114,19 @@ namespace UAS_MES_NEW.Make
                     return;
                 }
             }
-            sql.Clear();
+            /*sql.Clear();
             sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS,SU_CLEANNUMS,su_usedate)");
             sql.Append("select StencilUse_seq.nextval,st_id,'" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "'");
             sql.Append(",st_version,'借出',ST_CLEANNUMS,sysdate from ");
             sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
-            dh.ExecuteSql(sql.ToString(), "insert");
+            dh.ExecuteSql(sql.ToString(), "insert");*/
+
+            dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_status,su_indate,su_useman,su_usemancode)
+                SELECT stenciluse_seq.NEXTVAL,st_id, '{SU_DEVCODE.Text}','出库', sysdate,'{User.UserName}','{User.UserCode}' FROM stencil
+                WHERE st_code = '{SU_DEVCODE.Text}'", "insert");
+
             dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
-            MessageBox.Show("领用成功");
+            MessageBox.Show("出库成功");
             SU_DEVCODE.Text = "";
             Receive.Enabled = false;
             LoadGridData();
@@ -162,9 +167,9 @@ namespace UAS_MES_NEW.Make
                     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($@"INSERT INTO stenciluse (su_id,su_cleannums,su_returnman,su_stid,su_stcode,
+                    dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_cleannums,su_returnman,su_stid,su_stcode,su_useman,su_usemancode,su_indate,
                         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()}',
+                        SELECT stenciluse_seq.NEXTVAL,'{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}','{User.UserName}',st_id,'{SU_DEVCODE1.Text.Trim()}','{User.UserName}','{User.UserCode}',sysdate,
                         sysdate,sysdate,'在仓', '{(SU_RETURNIFCLEAN.Checked ? -1 : 0)}'
                         FROM stencil WHERE st_code = '{SU_DEVCODE1.Text}'", "insert");
 
@@ -173,7 +178,7 @@ namespace UAS_MES_NEW.Make
                     sql.Append("  ");
                     sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
                     dh.ExecuteSql(sql.ToString(), "update");
-                    MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "退回成功！");
+                    MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "回库成功！");
                     SU_DEVCODE1.Text = "";
                     ST_ENSIONA.Text = "";
                     ST_ENSIONB.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.Designer.cs

@@ -81,7 +81,7 @@
             this.RadioReceive.Size = new System.Drawing.Size(79, 32);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
-            this.RadioReceive.Text = "领用";
+            this.RadioReceive.Text = "出库";
             this.RadioReceive.UseVisualStyleBackColor = true;
             this.RadioReceive.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -95,7 +95,7 @@
             this.RadioReturn.Size = new System.Drawing.Size(79, 32);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
-            this.RadioReturn.Text = "退回";
+            this.RadioReturn.Text = "回库";
             this.RadioReturn.UseVisualStyleBackColor = true;
             this.RadioReturn.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
@@ -286,7 +286,7 @@
             this.Receive.Power = null;
             this.Receive.Size = new System.Drawing.Size(102, 42);
             this.Receive.TabIndex = 104;
-            this.Receive.Text = "领用";
+            this.Receive.Text = "出库";
             this.Receive.UseVisualStyleBackColor = false;
             this.Receive.Click += new System.EventHandler(this.Receive_Click);
             // 
@@ -306,7 +306,7 @@
             this.Return.Size = new System.Drawing.Size(102, 42);
             this.Return.TabIndex = 103;
             this.Return.Tag = "Make!SMTStockStencil";
-            this.Return.Text = "退回";
+            this.Return.Text = "回库";
             this.Return.UseVisualStyleBackColor = false;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -114,14 +114,20 @@ namespace UAS_MES_NEW.Make
                     return;
                 }
             }
-            sql.Clear();
+            /*sql.Clear();
             sql.Append("insert into StencilUse(su_id,su_stid,su_stcode,su_stockusedate,su_useman,SU_USEMANCODE,su_stverison,SU_STATUS,SU_CLEANNUMS,su_usedate)");
             sql.Append("select StencilUse_seq.nextval,st_id,'" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "'");
             sql.Append(",st_version,'借出',ST_CLEANNUMS,sysdate from ");
             sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
-            dh.ExecuteSql(sql.ToString(), "insert");
+            dh.ExecuteSql(sql.ToString(), "insert");*/
+
+            dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_status,su_indate,su_useman,su_usemancode)
+                SELECT stenciluse_seq.NEXTVAL,st_id, '{SU_DEVCODE.Text}','出库', sysdate,'{User.UserName}','{User.UserCode}' FROM stencil
+                WHERE st_code = '{SU_DEVCODE.Text}'", "insert");
+
             dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
-            MessageBox.Show("领用成功");
+
+            MessageBox.Show("出库成功");
             SU_DEVCODE.Text = "";
             Receive.Enabled = false;
             LoadGridData();
@@ -163,10 +169,10 @@ namespace UAS_MES_NEW.Make
                     dh.ExecuteSql(sql.ToString(), "update");*/
 
                     sql.Clear();
-                    sql.Append($@"INSERT INTO stenciluse (su_id,su_cleannums,su_returnman,su_stid,su_stcode,
+                    sql.Append($@"INSERT INTO stenciluse (su_id,su_cleannums,su_returnman,su_stid,su_stcode,su_useman,su_usemancode,su_indate,
                         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)}'
+                        SELECT stenciluse_seq.NEXTVAL,'{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}','{User.UserName}',st_id,'{SU_DEVCODE1.Text.Trim()}','{User.UserName}','{User.UserCode}',sysdate,
+                        sysdate,sysdate,'回库', '{(SU_RETURNIFCLEAN.Checked ? -1 : 0)}'
                         FROM stencil WHERE st_code = '{SU_DEVCODE1.Text}'");
                     dh.ExecuteSql(sql.ToString(), "insert");
 
@@ -175,7 +181,7 @@ namespace UAS_MES_NEW.Make
                     sql.Append("  ");
                     sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
                     dh.ExecuteSql(sql.ToString(), "update");
-                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
+                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "回库成功！");
                     SU_DEVCODE1.Text = "";
                     ST_ENSIONA.Text = "";
                     ST_ENSIONB.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.resx

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

UAS_MES_WEIP/UAS_MES_WEIP.csproj

@@ -549,6 +549,12 @@
     <Compile Include="FunctionCode\Make\Make_FeedingCollectionCombine.Designer.cs">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_BakingManage.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BakingManage.Designer.cs">
+      <DependentUpon>Make_BakingManage.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_NewDev.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1351,6 +1357,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollectionCombine.resx">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BakingManage.resx">
+      <DependentUpon>Make_BakingManage.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_NewDev.resx">
       <DependentUpon>Make_NewDev.cs</DependentUpon>
     </EmbeddedResource>