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

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.Designer.cs

@@ -30,6 +30,16 @@
         {
             this.Container = new System.Windows.Forms.TableLayoutPanel();
             this.DataBox = new System.Windows.Forms.DataGridView();
+            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = new System.Windows.Forms.Label();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.panel2 = new System.Windows.Forms.Panel();
             this.EmployeeVal1 = new System.Windows.Forms.TextBox();
@@ -38,7 +48,9 @@
             this.ReelNoVal1 = new System.Windows.Forms.TextBox();
             this.ReelNoLab1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.EmployeeVal = new System.Windows.Forms.TextBox();
             this.EmployeeLab = new System.Windows.Forms.Label();
             this.EstimateLab1 = new System.Windows.Forms.Label();
@@ -59,29 +71,18 @@
             this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WORK_ORDER = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BAKING_QTY = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.IN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ESTIMATE_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BAKING_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.productName = new System.Windows.Forms.Label();
-            this.productCode = new System.Windows.Forms.Label();
-            this.workOrder = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.serialNumber = new System.Windows.Forms.Label();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.Container.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
-            this.SNDetails.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // Container
@@ -112,6 +113,7 @@
             this.BOX_NO,
             this.WORK_ORDER,
             this.REEL_NO,
+            this.BAKING_QTY,
             this.IN_DATE,
             this.ESTIMATE_TIME,
             this.IN_NAME,
@@ -126,6 +128,134 @@
             this.DataBox.Size = new System.Drawing.Size(1274, 390);
             this.DataBox.TabIndex = 155;
             // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SNDetails.Location = new System.Drawing.Point(3, 4);
+            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
+            this.SNDetails.TabIndex = 4;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "条码信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 64);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // productName
+            // 
+            this.productName.AutoSize = true;
+            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productName.Location = new System.Drawing.Point(876, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(389, 64);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(628, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(161, 64);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(394, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(147, 64);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(795, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(75, 64);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "物料规格: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 64);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "条码号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(547, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 64);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "物料编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(313, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 64);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "物料名称: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(84, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(223, 64);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
             // tableLayoutPanel2
             // 
             this.tableLayoutPanel2.ColumnCount = 2;
@@ -227,6 +357,18 @@
             this.panel1.Size = new System.Drawing.Size(631, 204);
             this.panel1.TabIndex = 136;
             // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(311, 19);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 181;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
             // ms_makecode_label
             // 
             this.ms_makecode_label.AutoSize = true;
@@ -238,6 +380,25 @@
             this.ms_makecode_label.TabIndex = 179;
             this.ms_makecode_label.Text = "归属工单:";
             // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(102, 19);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(205, 32);
+            this.ma_code.TabIndex = 180;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
             // EmployeeVal
             // 
             this.EmployeeVal.Location = new System.Drawing.Point(102, 60);
@@ -427,6 +588,15 @@
             this.REEL_NO.ReadOnly = true;
             this.REEL_NO.Width = 150;
             // 
+            // BAKING_QTY
+            // 
+            this.BAKING_QTY.DataPropertyName = "BAKING_QTY";
+            this.BAKING_QTY.HeaderText = "烘烤数量";
+            this.BAKING_QTY.MinimumWidth = 8;
+            this.BAKING_QTY.Name = "BAKING_QTY";
+            this.BAKING_QTY.ReadOnly = true;
+            this.BAKING_QTY.Width = 120;
+            // 
             // IN_DATE
             // 
             this.IN_DATE.DataPropertyName = "IN_DATE";
@@ -463,165 +633,6 @@
             this.BAKING_TIME.ReadOnly = true;
             this.BAKING_TIME.Width = 150;
             // 
-            // SNDetails
-            // 
-            this.SNDetails.BorderColor = System.Drawing.Color.Black;
-            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
-            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SNDetails.Location = new System.Drawing.Point(3, 4);
-            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.SNDetails.Name = "SNDetails";
-            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
-            this.SNDetails.TabIndex = 4;
-            this.SNDetails.TabStop = false;
-            this.SNDetails.Text = "条码信息";
-            this.SNDetails.TextColor = System.Drawing.Color.Black;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 8;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
-            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
-            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
-            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 1;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 64);
-            this.tableLayoutPanel1.TabIndex = 0;
-            // 
-            // productName
-            // 
-            this.productName.AutoSize = true;
-            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productName.Location = new System.Drawing.Point(876, 0);
-            this.productName.Name = "productName";
-            this.productName.Size = new System.Drawing.Size(389, 64);
-            this.productName.TabIndex = 7;
-            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // productCode
-            // 
-            this.productCode.AutoSize = true;
-            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productCode.Location = new System.Drawing.Point(628, 0);
-            this.productCode.Name = "productCode";
-            this.productCode.Size = new System.Drawing.Size(161, 64);
-            this.productCode.TabIndex = 6;
-            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // workOrder
-            // 
-            this.workOrder.AutoSize = true;
-            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.workOrder.Location = new System.Drawing.Point(394, 0);
-            this.workOrder.Name = "workOrder";
-            this.workOrder.Size = new System.Drawing.Size(147, 64);
-            this.workOrder.TabIndex = 5;
-            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(795, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(75, 64);
-            this.label4.TabIndex = 3;
-            this.label4.Text = "物料规格: ";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(3, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(75, 64);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "条码号: ";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(547, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(75, 64);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "物料编号: ";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(313, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(75, 64);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "物料名称: ";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // serialNumber
-            // 
-            this.serialNumber.AutoSize = true;
-            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.serialNumber.Location = new System.Drawing.Point(84, 0);
-            this.serialNumber.Name = "serialNumber";
-            this.serialNumber.Size = new System.Drawing.Size(223, 64);
-            this.serialNumber.TabIndex = 4;
-            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // LockMakeCode
-            // 
-            this.LockMakeCode.AutoSize = true;
-            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(311, 19);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 181;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(102, 19);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(205, 32);
-            this.ma_code.TabIndex = 180;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            // 
             // Make_BakingManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -636,14 +647,14 @@
             this.Load += new System.EventHandler(this.Make_InBaking_Load);
             this.Container.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.SNDetails.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -689,13 +700,14 @@
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private System.Windows.Forms.Label ms_makecode_label;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
         private System.Windows.Forms.DataGridViewTextBoxColumn BOX_NO;
         private System.Windows.Forms.DataGridViewTextBoxColumn WORK_ORDER;
         private System.Windows.Forms.DataGridViewTextBoxColumn REEL_NO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BAKING_QTY;
         private System.Windows.Forms.DataGridViewTextBoxColumn IN_DATE;
         private System.Windows.Forms.DataGridViewTextBoxColumn ESTIMATE_TIME;
         private System.Windows.Forms.DataGridViewTextBoxColumn IN_NAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn BAKING_TIME;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.cs

@@ -146,7 +146,7 @@ namespace UAS_MES_NEW.Make
         {
             SQL.Clear();
             SQL.Append($@"SELECT work_order,box_no,reel_no,in_date,in_name,estimate_time,trunc((sysdate - in_date) * 24) || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60, 60)), 2, '0')
-                || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60 * 60, 60)),2,'0') baking_time FROM baking_log WHERE status = '烘烤中' ORDER BY in_date DESC");
+                || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60 * 60, 60)),2,'0') baking_time,nvl(baking_qty,0) baking_qty FROM baking_log WHERE status = '烘烤中' ORDER BY in_date DESC");
             dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
             DataBox.DataSource = dt;
         }
@@ -299,9 +299,10 @@ namespace UAS_MES_NEW.Make
                 MessageBox.Show($"条码号:{ReelNoVal.Text} 已在烘烤箱中");
                 return;
             }
-
-            dh.ExecuteSql($@"INSERT INTO baking_log (baking_id,box_no,reel_no,status,in_date,in_name,estimate_time,work_order)
-                SELECT baking_log_seq.NEXTVAL,'', '{ReelNoVal.Text}', '烘烤中',sysdate,'{EmployeeVal.Text.Trim()}','{EstimateVal.Text}','{ma_code.Text}' FROM dual", "insert");
+            dt = (DataTable)dh.ExecuteSql($"select * from barcode where bar_code = '{ReelNoVal.Text}'", "select");
+            string baking_qty = dt.Rows[0]["BAR_REMAIN"].ToString();
+            dh.ExecuteSql($@"INSERT INTO baking_log (baking_id,box_no,reel_no,status,in_date,in_name,estimate_time,work_order，baking_qty)
+                SELECT baking_log_seq.NEXTVAL,'', '{ReelNoVal.Text}', '烘烤中',sysdate,'{EmployeeVal.Text.Trim()}','{EstimateVal.Text}','{ma_code.Text}',{baking_qty} FROM dual", "insert");
 
             //EmployeeVal.Text = "";
             //BackingVal.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.resx

@@ -126,25 +126,7 @@
   <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="BAKING_TIME.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="WORK_ORDER.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="REEL_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="BAKING_QTY.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">

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -39,6 +39,8 @@
             this.DotVal = new System.Windows.Forms.TextBox();
             this.Confirm = new System.Windows.Forms.Button();
             this.TopBox = new System.Windows.Forms.Panel();
+            this.SaveCache = new System.Windows.Forms.Button();
+            this.DeleteLog = new System.Windows.Forms.Button();
             this.IcDetailVal = new System.Windows.Forms.TextBox();
             this.IcDetailLab = new System.Windows.Forms.Label();
             this.CurrQtyVal = new System.Windows.Forms.TextBox();
@@ -54,6 +56,18 @@
             this.BurnLotnoLab = new System.Windows.Forms.Label();
             this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.DataBox = new System.Windows.Forms.DataGridView();
+            this.burn_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ic_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.inspect_res = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.RightBox = new System.Windows.Forms.Panel();
             this.ClearMsg = new System.Windows.Forms.Button();
@@ -67,17 +81,9 @@
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ic_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.inspect_res = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TopBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -193,6 +199,8 @@
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.SaveCache);
+            this.TopBox.Controls.Add(this.DeleteLog);
             this.TopBox.Controls.Add(this.IcDetailVal);
             this.TopBox.Controls.Add(this.IcDetailLab);
             this.TopBox.Controls.Add(this.CurrQtyVal);
@@ -223,6 +231,30 @@
             this.TopBox.Size = new System.Drawing.Size(1280, 201);
             this.TopBox.TabIndex = 153;
             // 
+            // SaveCache
+            // 
+            this.SaveCache.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.SaveCache.Enabled = false;
+            this.SaveCache.Location = new System.Drawing.Point(588, 138);
+            this.SaveCache.Name = "SaveCache";
+            this.SaveCache.Size = new System.Drawing.Size(95, 28);
+            this.SaveCache.TabIndex = 186;
+            this.SaveCache.Text = "保存缓存";
+            this.SaveCache.UseVisualStyleBackColor = true;
+            this.SaveCache.Click += new System.EventHandler(this.SaveCache_Click);
+            // 
+            // DeleteLog
+            // 
+            this.DeleteLog.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.DeleteLog.Enabled = false;
+            this.DeleteLog.Location = new System.Drawing.Point(691, 138);
+            this.DeleteLog.Name = "DeleteLog";
+            this.DeleteLog.Size = new System.Drawing.Size(95, 28);
+            this.DeleteLog.TabIndex = 185;
+            this.DeleteLog.Text = "删除记录";
+            this.DeleteLog.UseVisualStyleBackColor = true;
+            this.DeleteLog.Click += new System.EventHandler(this.DeleteLog_Click);
+            // 
             // IcDetailVal
             // 
             this.IcDetailVal.Location = new System.Drawing.Point(1100, 75);
@@ -375,6 +407,7 @@
             this.DataBox.BackgroundColor = System.Drawing.SystemColors.Control;
             this.DataBox.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DataBox.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.burn_id,
             this.work_order,
             this.burn_qty,
             this.burn_lotno,
@@ -389,12 +422,125 @@
             this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
             this.DataBox.Location = new System.Drawing.Point(3, 3);
+            this.DataBox.MultiSelect = false;
             this.DataBox.Name = "DataBox";
             this.DataBox.ReadOnly = true;
             this.DataBox.RowHeadersWidth = 62;
             this.DataBox.RowTemplate.Height = 30;
+            this.DataBox.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.DataBox.Size = new System.Drawing.Size(890, 513);
             this.DataBox.TabIndex = 154;
+            this.DataBox.SelectionChanged += new System.EventHandler(this.DataBox_SelectionChanged);
+            // 
+            // burn_id
+            // 
+            this.burn_id.DataPropertyName = "burn_id";
+            this.burn_id.HeaderText = "burn_id";
+            this.burn_id.MinimumWidth = 8;
+            this.burn_id.Name = "burn_id";
+            this.burn_id.ReadOnly = true;
+            this.burn_id.Visible = false;
+            this.burn_id.Width = 150;
+            // 
+            // work_order
+            // 
+            this.work_order.DataPropertyName = "work_order";
+            this.work_order.HeaderText = "工单号";
+            this.work_order.MinimumWidth = 8;
+            this.work_order.Name = "work_order";
+            this.work_order.ReadOnly = true;
+            this.work_order.Width = 150;
+            // 
+            // burn_qty
+            // 
+            this.burn_qty.DataPropertyName = "burn_qty";
+            this.burn_qty.HeaderText = "烧录数量";
+            this.burn_qty.MinimumWidth = 8;
+            this.burn_qty.Name = "burn_qty";
+            this.burn_qty.ReadOnly = true;
+            this.burn_qty.Width = 80;
+            // 
+            // burn_lotno
+            // 
+            this.burn_lotno.DataPropertyName = "burn_lotno";
+            this.burn_lotno.HeaderText = "烧录条码";
+            this.burn_lotno.MinimumWidth = 8;
+            this.burn_lotno.Name = "burn_lotno";
+            this.burn_lotno.ReadOnly = true;
+            this.burn_lotno.Width = 150;
+            // 
+            // line
+            // 
+            this.line.DataPropertyName = "line";
+            this.line.HeaderText = "线体";
+            this.line.MinimumWidth = 8;
+            this.line.Name = "line";
+            this.line.ReadOnly = true;
+            this.line.Visible = false;
+            this.line.Width = 150;
+            // 
+            // burn_software
+            // 
+            this.burn_software.DataPropertyName = "burn_software";
+            this.burn_software.HeaderText = "烧录软件";
+            this.burn_software.MinimumWidth = 8;
+            this.burn_software.Name = "burn_software";
+            this.burn_software.ReadOnly = true;
+            this.burn_software.Width = 150;
+            // 
+            // check_code
+            // 
+            this.check_code.DataPropertyName = "check_code";
+            this.check_code.HeaderText = "校验码";
+            this.check_code.MinimumWidth = 8;
+            this.check_code.Name = "check_code";
+            this.check_code.ReadOnly = true;
+            this.check_code.Width = 150;
+            // 
+            // dot_detail
+            // 
+            this.dot_detail.DataPropertyName = "dot_detail";
+            this.dot_detail.HeaderText = "打点信息";
+            this.dot_detail.MinimumWidth = 8;
+            this.dot_detail.Name = "dot_detail";
+            this.dot_detail.ReadOnly = true;
+            this.dot_detail.Width = 150;
+            // 
+            // ic_detail
+            // 
+            this.ic_detail.DataPropertyName = "ic_detail";
+            this.ic_detail.HeaderText = "芯片信息";
+            this.ic_detail.MinimumWidth = 8;
+            this.ic_detail.Name = "ic_detail";
+            this.ic_detail.ReadOnly = true;
+            this.ic_detail.Width = 150;
+            // 
+            // update_time
+            // 
+            this.update_time.DataPropertyName = "update_time";
+            this.update_time.HeaderText = "操作时间";
+            this.update_time.MinimumWidth = 8;
+            this.update_time.Name = "update_time";
+            this.update_time.ReadOnly = true;
+            this.update_time.Width = 150;
+            // 
+            // update_name
+            // 
+            this.update_name.DataPropertyName = "update_name";
+            this.update_name.HeaderText = "操作人";
+            this.update_name.MinimumWidth = 8;
+            this.update_name.Name = "update_name";
+            this.update_name.ReadOnly = true;
+            this.update_name.Width = 150;
+            // 
+            // inspect_res
+            // 
+            this.inspect_res.DataPropertyName = "inspect_res";
+            this.inspect_res.HeaderText = "抽检结果";
+            this.inspect_res.MinimumWidth = 8;
+            this.inspect_res.Name = "inspect_res";
+            this.inspect_res.ReadOnly = true;
+            this.inspect_res.Width = 80;
             // 
             // tableLayoutPanel1
             // 
@@ -454,6 +600,7 @@
             this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
             this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Visible = false;
             this.dataGridViewTextBoxColumn1.Width = 150;
             // 
             // dataGridViewTextBoxColumn2
@@ -491,6 +638,7 @@
             this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
             this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Visible = false;
             this.dataGridViewTextBoxColumn5.Width = 150;
             // 
             // dataGridViewTextBoxColumn6
@@ -526,107 +674,34 @@
             this.dataGridViewTextBoxColumn9.HeaderText = "操作人";
             this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
             this.dataGridViewTextBoxColumn9.Width = 150;
             // 
-            // work_order
+            // dataGridViewTextBoxColumn10
             // 
-            this.work_order.DataPropertyName = "work_order";
-            this.work_order.HeaderText = "工单号";
-            this.work_order.MinimumWidth = 8;
-            this.work_order.Name = "work_order";
-            this.work_order.ReadOnly = true;
-            this.work_order.Width = 150;
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "update_name";
+            this.dataGridViewTextBoxColumn10.HeaderText = "操作人";
+            this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            this.dataGridViewTextBoxColumn10.Width = 150;
             // 
-            // burn_qty
+            // dataGridViewTextBoxColumn11
             // 
-            this.burn_qty.DataPropertyName = "burn_qty";
-            this.burn_qty.HeaderText = "烧录数量";
-            this.burn_qty.MinimumWidth = 8;
-            this.burn_qty.Name = "burn_qty";
-            this.burn_qty.ReadOnly = true;
-            this.burn_qty.Width = 80;
-            // 
-            // burn_lotno
-            // 
-            this.burn_lotno.DataPropertyName = "burn_lotno";
-            this.burn_lotno.HeaderText = "烧录条码";
-            this.burn_lotno.MinimumWidth = 8;
-            this.burn_lotno.Name = "burn_lotno";
-            this.burn_lotno.ReadOnly = true;
-            this.burn_lotno.Width = 150;
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "inspect_res";
+            this.dataGridViewTextBoxColumn11.HeaderText = "抽检结果";
+            this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            this.dataGridViewTextBoxColumn11.Width = 80;
             // 
-            // line
+            // dataGridViewTextBoxColumn12
             // 
-            this.line.DataPropertyName = "line";
-            this.line.HeaderText = "线体";
-            this.line.MinimumWidth = 8;
-            this.line.Name = "line";
-            this.line.ReadOnly = true;
-            this.line.Visible = false;
-            this.line.Width = 150;
-            // 
-            // burn_software
-            // 
-            this.burn_software.DataPropertyName = "burn_software";
-            this.burn_software.HeaderText = "烧录软件";
-            this.burn_software.MinimumWidth = 8;
-            this.burn_software.Name = "burn_software";
-            this.burn_software.ReadOnly = true;
-            this.burn_software.Width = 150;
-            // 
-            // check_code
-            // 
-            this.check_code.DataPropertyName = "check_code";
-            this.check_code.HeaderText = "校验码";
-            this.check_code.MinimumWidth = 8;
-            this.check_code.Name = "check_code";
-            this.check_code.ReadOnly = true;
-            this.check_code.Width = 150;
-            // 
-            // dot_detail
-            // 
-            this.dot_detail.DataPropertyName = "dot_detail";
-            this.dot_detail.HeaderText = "打点信息";
-            this.dot_detail.MinimumWidth = 8;
-            this.dot_detail.Name = "dot_detail";
-            this.dot_detail.ReadOnly = true;
-            this.dot_detail.Width = 150;
-            // 
-            // ic_detail
-            // 
-            this.ic_detail.DataPropertyName = "ic_detail";
-            this.ic_detail.HeaderText = "芯片信息";
-            this.ic_detail.MinimumWidth = 8;
-            this.ic_detail.Name = "ic_detail";
-            this.ic_detail.ReadOnly = true;
-            this.ic_detail.Width = 150;
-            // 
-            // update_time
-            // 
-            this.update_time.DataPropertyName = "update_time";
-            this.update_time.HeaderText = "操作时间";
-            this.update_time.MinimumWidth = 8;
-            this.update_time.Name = "update_time";
-            this.update_time.ReadOnly = true;
-            this.update_time.Width = 150;
-            // 
-            // update_name
-            // 
-            this.update_name.DataPropertyName = "update_name";
-            this.update_name.HeaderText = "操作人";
-            this.update_name.MinimumWidth = 8;
-            this.update_name.Name = "update_name";
-            this.update_name.ReadOnly = true;
-            this.update_name.Width = 150;
-            // 
-            // inspect_res
-            // 
-            this.inspect_res.DataPropertyName = "inspect_res";
-            this.inspect_res.HeaderText = "抽检结果";
-            this.inspect_res.MinimumWidth = 8;
-            this.inspect_res.Name = "inspect_res";
-            this.inspect_res.ReadOnly = true;
-            this.inspect_res.Width = 80;
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "inspect_res";
+            this.dataGridViewTextBoxColumn12.HeaderText = "抽检结果";
+            this.dataGridViewTextBoxColumn12.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.Width = 80;
             // 
             // Make_BurnInfo
             // 
@@ -691,6 +766,10 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.TextBox IcDetailVal;
         private System.Windows.Forms.Label IcDetailLab;
+        private System.Windows.Forms.Button DeleteLog;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
@@ -702,5 +781,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn update_time;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn inspect_res;
+        private System.Windows.Forms.Button SaveCache;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -24,6 +24,7 @@ namespace UAS_MES_NEW.Make
         DataHelper dh;
         DataTable dt;
         string remainQty;
+        DateTime callTime = DateTime.Now;
 
         private void Make_BurnInfo_Load(object sender, EventArgs e)
         {
@@ -65,15 +66,29 @@ namespace UAS_MES_NEW.Make
                 BaseUtil.SetFormValue(this.Controls, dt);
             }
 
-            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
-            DataBox.DataSource = dt;
-            dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
-            if (dt.Rows.Count > 0)
+            if ((DateTime.Now - callTime).TotalSeconds > 10)
             {
-                CurrQtyVal.Text = dt.Rows[0]["allqty"].ToString();
+                callTime = DateTime.Now;
+                dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
+                DataBox.DataSource = dt;
+                ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
+                dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    CurrQtyVal.Text = dt.Rows[0]["allqty"].ToString();
+                }
+
+                if (BaseUtil.GetCacheData("BurnInfoWo").ToString() == ma_code.Text.Trim())
+                {
+                    BurnSwVal.Text = BaseUtil.GetCacheData("BurnInfo_BurnSwVal").ToString();
+                    CheckCodeVal.Text = BaseUtil.GetCacheData("BurnInfo_CheckCodeVal").ToString();
+                    DotVal.Text = BaseUtil.GetCacheData("BurnInfo_DotVal").ToString();
+                    IcDetailVal.Text = BaseUtil.GetCacheData("BurnInfo_IcDetailVal").ToString();
+                }
             }
 
-            ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
+            if (!string.IsNullOrEmpty(ma_code.Text)) SaveCache.Enabled = true;
+            else SaveCache.Enabled = false;
         }
 
         private void Confirm_Click(object sender, EventArgs e)
@@ -121,7 +136,7 @@ namespace UAS_MES_NEW.Make
 
             ShowMsg(1, "添加烧录信息成功");
 
-            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
+            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
             DataBox.DataSource = dt;
             dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
             if (dt.Rows.Count > 0)
@@ -219,7 +234,7 @@ namespace UAS_MES_NEW.Make
 
             ShowMsg(1, $"批号:{BurnLotnoVal.Text} 添加烧录信息成功");
 
-            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
+            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
             DataBox.DataSource = dt;
             dt = (DataTable)dh.ExecuteSql($"select nvl(sum(burn_qty),0) allqty from burn_info where work_order = '{ma_code.Text}'", "select");
             if (dt.Rows.Count > 0)
@@ -228,6 +243,50 @@ namespace UAS_MES_NEW.Make
             }
         }
 
+        private void DeleteLog_Click(object sender, EventArgs e)
+        {
+            if (DataBox.SelectedRows.Count == 0)
+            {
+                ShowMsg(0, "请在列表选中需删除记录");
+                return;
+            }
+
+            string burn_id = DataBox.SelectedRows[0].Cells["burn_id"].Value?.ToString(); 
+            string burn_lotno = DataBox.SelectedRows[0].Cells["BURN_LOTNO"].Value?.ToString();
+
+            DialogResult res = MessageBox.Show($"确认删除烧录条码:{burn_lotno}","Warning",MessageBoxButtons.YesNo,MessageBoxIcon.Warning);
+            if(res == DialogResult.Yes)
+            {
+                dh.ExecuteSql($"delete burn_info where burn_id = '{burn_id}'", "delete");
+
+                dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME,BURN_QTY,inspect_res,IC_DETAIL,burn_id FROM burn_info LEFT JOIN burn_inspect ON burn_id = burnid WHERE work_order = '{ma_code.Text}'", "select");
+                DataBox.DataSource = dt;
+            }
+        }
+
+        private void DataBox_SelectionChanged(object sender, EventArgs e)
+        {
+            if (DataBox.SelectedRows.Count > 0)
+            {
+                DeleteLog.Enabled = true;
+            }
+            else
+            {
+                DeleteLog.Enabled = false;
+            }
+        }
+
+        private void SaveCache_Click(object sender, EventArgs e)
+        {
+            BaseUtil.SetCacheData("BurnInfoWo", ma_code.Text.Trim());
+            BaseUtil.SetCacheData("BurnInfo_BurnSwVal", BurnSwVal.Text.Trim());
+            BaseUtil.SetCacheData("BurnInfo_CheckCodeVal", CheckCodeVal.Text.Trim());
+            BaseUtil.SetCacheData("BurnInfo_DotVal", DotVal.Text.Trim());
+            BaseUtil.SetCacheData("BurnInfo_IcDetailVal", IcDetailVal.Text.Trim());
+
+            ShowMsg(1, $"已缓存工单: {ma_code.Text.Trim()} 输入信息");
+        }
+
         private void BurnSwVal_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode != Keys.Enter) return;

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <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>

UAS_MES_WEIP/FunctionCode/Make/Make_PcbClean.cs

@@ -152,8 +152,17 @@ namespace UAS_MES_NEW.Make
                 {
                     singleSn = item["sb_barcode"].ToString();
 
+                    dt = (DataTable)dh.ExecuteSql($@"select * from sn_clean where SN = '{singleSn}'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        ShowMsg(0, $"序列号:{singleSn} 已记录清洗");
+                        SnVal.Focus();
+                        SnVal.SelectAll();
+                        continue;
+                    }
+
                     dh.ExecuteSql($@"INSERT INTO sn_clean (CLEAN_ID,SN,WORK_ORDER,LINE,SIDE,UPDATE_TIME,UPDATE_NAME)
-                    VALUES (CLEAN_ID_SEQ.NEXTVAL, '{singleSn}','{WoVal.Text}','{LineVal.Text}','{SideVal.Text}',sysdate,'{EmployeeVal.Text}')", "insert");
+                        VALUES (CLEAN_ID_SEQ.NEXTVAL, '{singleSn}','{WoVal.Text}','{LineVal.Text}','{SideVal.Text}',sysdate,'{EmployeeVal.Text}')", "insert");
                     ShowMsg(1, $"序列号:{singleSn} 已记录清洗");
                     SnVal.Focus();
                     SnVal.SelectAll();

UAS_MES_WEIP/PublicMethod/LogicHandler.cs

@@ -795,7 +795,7 @@ namespace UAS_MES_NEW.PublicMethod
                 string ms_status = dt.Rows[0]["ms_status"].ToString();
                 if (ms_status == "2")
                 {
-                    dh.ExecuteSql("delete from steppassed where sp_sncode='" + iSnCode + "' and sp_makecode='" + iMakeCode + "' and sp_stepcode='" + StepCode + "'", "delete");
+                    //dh.ExecuteSql("delete from steppassed where sp_sncode='" + iSnCode + "' and sp_makecode='" + iMakeCode + "' and sp_stepcode='" + StepCode + "'", "delete");
                     dh.UpdateByCondition("make", "ma_madeqty=nvl(ma_madeqty,0)-1", "ma_code='" + iMakeCode + "'");
                 }
                 if (ms_stepcode == StepCode)

UAS_Tools_HY/Main.Designer.cs

@@ -34,13 +34,6 @@
             this.checkPagination = new System.Windows.Forms.TabControl();
             this.checkPage1 = new System.Windows.Forms.TabPage();
             this.Datas = new System.Windows.Forms.DataGridView();
-            this.DbarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DboxCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DcountCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DtimeCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Duser = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DisCheckdcr = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Dresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.checkPage2 = new System.Windows.Forms.TabPage();
             this.checkSetting = new System.Windows.Forms.TableLayoutPanel();
             this.checkSettingRight = new System.Windows.Forms.GroupBox();
@@ -150,6 +143,14 @@
             this.currUser = new System.Windows.Forms.Label();
             this.currTime = new System.Windows.Forms.Label();
             this.top = new System.Windows.Forms.Panel();
+            this.DbarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DboxCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DcountCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DtimeCol = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Duser = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DisCheckdcr = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Dresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.visualOutboxNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Pagination.SuspendLayout();
             this.Page1.SuspendLayout();
             this.checkPagination.SuspendLayout();
@@ -249,7 +250,8 @@
             this.DtimeCol,
             this.Duser,
             this.DisCheckdcr,
-            this.Dresult});
+            this.Dresult,
+            this.visualOutboxNo});
             this.Datas.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Datas.Location = new System.Drawing.Point(3, 3);
             this.Datas.MultiSelect = false;
@@ -260,69 +262,6 @@
             this.Datas.Size = new System.Drawing.Size(1224, 329);
             this.Datas.TabIndex = 0;
             // 
-            // DbarCode
-            // 
-            this.DbarCode.DataPropertyName = "DbarCode";
-            this.DbarCode.HeaderText = "条码";
-            this.DbarCode.MinimumWidth = 8;
-            this.DbarCode.Name = "DbarCode";
-            this.DbarCode.ReadOnly = true;
-            this.DbarCode.Width = 240;
-            // 
-            // DboxCode
-            // 
-            this.DboxCode.DataPropertyName = "DboxCode";
-            this.DboxCode.HeaderText = "箱号";
-            this.DboxCode.MinimumWidth = 8;
-            this.DboxCode.Name = "DboxCode";
-            this.DboxCode.ReadOnly = true;
-            this.DboxCode.Width = 260;
-            // 
-            // DcountCol
-            // 
-            this.DcountCol.DataPropertyName = "DcountCol";
-            this.DcountCol.HeaderText = "扫描次数";
-            this.DcountCol.MinimumWidth = 8;
-            this.DcountCol.Name = "DcountCol";
-            this.DcountCol.ReadOnly = true;
-            this.DcountCol.Width = 120;
-            // 
-            // DtimeCol
-            // 
-            this.DtimeCol.DataPropertyName = "DtimeCol";
-            this.DtimeCol.HeaderText = "扫描时间";
-            this.DtimeCol.MinimumWidth = 8;
-            this.DtimeCol.Name = "DtimeCol";
-            this.DtimeCol.ReadOnly = true;
-            this.DtimeCol.Width = 180;
-            // 
-            // Duser
-            // 
-            this.Duser.DataPropertyName = "Duser";
-            this.Duser.HeaderText = "扫描人";
-            this.Duser.MinimumWidth = 8;
-            this.Duser.Name = "Duser";
-            this.Duser.ReadOnly = true;
-            this.Duser.Width = 120;
-            // 
-            // DisCheckdcr
-            // 
-            this.DisCheckdcr.DataPropertyName = "DisCheckdcr";
-            this.DisCheckdcr.HeaderText = "是否核对DCR";
-            this.DisCheckdcr.MinimumWidth = 8;
-            this.DisCheckdcr.Name = "DisCheckdcr";
-            this.DisCheckdcr.ReadOnly = true;
-            this.DisCheckdcr.Width = 160;
-            // 
-            // Dresult
-            // 
-            this.Dresult.DataPropertyName = "Dresult";
-            this.Dresult.HeaderText = "扫描结果";
-            this.Dresult.MinimumWidth = 8;
-            this.Dresult.Name = "Dresult";
-            this.Dresult.ReadOnly = true;
-            this.Dresult.Width = 120;
-            // 
             // checkPage2
             // 
             this.checkPage2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -520,6 +459,7 @@
             this.RulesCol4,
             this.RulesCol5,
             this.RulesCol6});
+            this.RulesDatas.Cursor = System.Windows.Forms.Cursors.Hand;
             this.RulesDatas.Dock = System.Windows.Forms.DockStyle.Fill;
             this.RulesDatas.Location = new System.Drawing.Point(0, 83);
             this.RulesDatas.MultiSelect = false;
@@ -527,6 +467,7 @@
             this.RulesDatas.ReadOnly = true;
             this.RulesDatas.RowHeadersWidth = 62;
             this.RulesDatas.RowTemplate.Height = 30;
+            this.RulesDatas.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.RulesDatas.Size = new System.Drawing.Size(1230, 252);
             this.RulesDatas.TabIndex = 16;
             this.RulesDatas.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.RulesDatas_CellMouseClick);
@@ -1532,6 +1473,77 @@
             this.top.Size = new System.Drawing.Size(1254, 625);
             this.top.TabIndex = 3;
             // 
+            // DbarCode
+            // 
+            this.DbarCode.DataPropertyName = "DbarCode";
+            this.DbarCode.HeaderText = "条码";
+            this.DbarCode.MinimumWidth = 8;
+            this.DbarCode.Name = "DbarCode";
+            this.DbarCode.ReadOnly = true;
+            this.DbarCode.Width = 240;
+            // 
+            // DboxCode
+            // 
+            this.DboxCode.DataPropertyName = "DboxCode";
+            this.DboxCode.HeaderText = "箱号";
+            this.DboxCode.MinimumWidth = 8;
+            this.DboxCode.Name = "DboxCode";
+            this.DboxCode.ReadOnly = true;
+            this.DboxCode.Width = 260;
+            // 
+            // DcountCol
+            // 
+            this.DcountCol.DataPropertyName = "DcountCol";
+            this.DcountCol.HeaderText = "扫描次数";
+            this.DcountCol.MinimumWidth = 8;
+            this.DcountCol.Name = "DcountCol";
+            this.DcountCol.ReadOnly = true;
+            this.DcountCol.Width = 120;
+            // 
+            // DtimeCol
+            // 
+            this.DtimeCol.DataPropertyName = "DtimeCol";
+            this.DtimeCol.HeaderText = "扫描时间";
+            this.DtimeCol.MinimumWidth = 8;
+            this.DtimeCol.Name = "DtimeCol";
+            this.DtimeCol.ReadOnly = true;
+            this.DtimeCol.Width = 180;
+            // 
+            // Duser
+            // 
+            this.Duser.DataPropertyName = "Duser";
+            this.Duser.HeaderText = "扫描人";
+            this.Duser.MinimumWidth = 8;
+            this.Duser.Name = "Duser";
+            this.Duser.ReadOnly = true;
+            this.Duser.Width = 120;
+            // 
+            // DisCheckdcr
+            // 
+            this.DisCheckdcr.DataPropertyName = "DisCheckdcr";
+            this.DisCheckdcr.HeaderText = "是否核对DCR";
+            this.DisCheckdcr.MinimumWidth = 8;
+            this.DisCheckdcr.Name = "DisCheckdcr";
+            this.DisCheckdcr.ReadOnly = true;
+            this.DisCheckdcr.Width = 160;
+            // 
+            // Dresult
+            // 
+            this.Dresult.DataPropertyName = "Dresult";
+            this.Dresult.HeaderText = "扫描结果";
+            this.Dresult.MinimumWidth = 8;
+            this.Dresult.Name = "Dresult";
+            this.Dresult.ReadOnly = true;
+            this.Dresult.Width = 120;
+            // 
+            // visualOutboxNo
+            // 
+            this.visualOutboxNo.HeaderText = "visualOutboxNo";
+            this.visualOutboxNo.MinimumWidth = 8;
+            this.visualOutboxNo.Name = "visualOutboxNo";
+            this.visualOutboxNo.ReadOnly = true;
+            this.visualOutboxNo.Visible = false;
+            // 
             // Main
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -1663,13 +1675,6 @@
         private System.Windows.Forms.Label rulesLab2;
         private System.Windows.Forms.TextBox rulesInput2;
         private System.Windows.Forms.Button rulesAdd;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DbarCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DboxCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DcountCol;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DtimeCol;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Duser;
-        private System.Windows.Forms.DataGridViewTextBoxColumn DisCheckdcr;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Dresult;
         private System.Windows.Forms.Button DRulesBtn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn ruleId;
         private System.Windows.Forms.DataGridViewTextBoxColumn RulesCol1;
@@ -1713,5 +1718,13 @@
         private System.Windows.Forms.Label handExeLab1;
         private System.Windows.Forms.TextBox handExeVal;
         private System.Windows.Forms.Button buildConfirm;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DbarCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DboxCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DcountCol;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DtimeCol;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Duser;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DisCheckdcr;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Dresult;
+        private System.Windows.Forms.DataGridViewTextBoxColumn visualOutboxNo;
     }
 }

UAS_Tools_HY/Main.cs

@@ -183,6 +183,11 @@ namespace UAS_MES_Tools
             }
             else
             {
+                if (string.IsNullOrEmpty(BoxNo.Text) && string.IsNullOrEmpty(BaseUtil.GetCacheData("VisualOutboxNo").ToString()))
+                {
+                    BaseUtil.SetCacheData("VisualOutboxNo", DateTime.Now.ToString("yyyyMMddHHmmss"));
+                    BoxNo_KeyDown(null, new KeyEventArgs(Keys.Enter));
+                }
                 DataGridViewRow row = new DataGridViewRow();
                 row.CreateCells(Datas);
                 row.Cells[0].Value = SN.Text.Trim();
@@ -192,6 +197,7 @@ namespace UAS_MES_Tools
                 row.Cells[4].Value = _UserName;
                 row.Cells[5].Value = radio1.Checked ? "是" : "否";
                 row.Cells[6].Value = checkRes ? "OK" : "NG";
+                row.Cells[7].Value = string.IsNullOrEmpty(BoxNo.Text) ? BaseUtil.GetCacheData("VisualOutboxNo") : "";
                 Datas.Rows.Add(row);
                 PlaySound("OK");
                 Datas.FirstDisplayedScrollingRowIndex = Datas.Rows.Count - 1;
@@ -214,6 +220,7 @@ namespace UAS_MES_Tools
                         BoxNo.SelectAll();
                         //BoxNo.Text = "";
                         //Datas.Rows.Clear();
+                        BaseUtil.SetCacheData("VisualOutboxNo", "");
 
                         Application excelApp = null;
                         Workbook workbook = null;
@@ -222,7 +229,9 @@ namespace UAS_MES_Tools
                         string tempTemplatePath = null;
                         try
                         {
-                            string checkExportModel = Path.Combine(settingRightInput2.Text, BoxNo.Text.Trim() + ".xlsx");
+                            string visualOutboxNo = string.IsNullOrEmpty(row.Cells[1].Value.ToString()) ? row.Cells[7].Value.ToString() : row.Cells[1].Value.ToString();
+                            string generateFileName = string.IsNullOrEmpty(row.Cells[1].Value.ToString()) ? DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss") : row.Cells[1].Value.ToString();
+                            string checkExportModel = Path.Combine(settingRightInput2.Text, generateFileName + ".xlsx");
 
                             if (string.IsNullOrEmpty(settingRightInput2.Text) || !Directory.Exists(settingRightInput2.Text))
                             {
@@ -247,11 +256,11 @@ namespace UAS_MES_Tools
                             object sheetIndex = 1;
                             worksheet = (Worksheet)workbook.Worksheets[sheetIndex];
 
-                            dt = ConnectDB.ExecuteSelect($@"select * from g_packing_sncheck where outbox_no = '{BoxNo.Text.Trim()}'");
+                            dt = ConnectDB.ExecuteSelect($@"select * from g_packing_sncheck where outbox_no = '{visualOutboxNo}'");
                             if (dt.Rows.Count > 0)
                             {
                                 worksheet.Cells[1, 3] = DateTime.Now.ToString("yyyy-MM-dd");
-                                worksheet.Cells[1, 7] = BoxNo.Text.Trim();
+                                worksheet.Cells[1, 7] = visualOutboxNo;
 
                                 int startRow = 3;
                                 int startColumn = 2;
@@ -373,9 +382,10 @@ namespace UAS_MES_Tools
         {
             int inputSum = Convert.ToInt32(dCount.Text);
             dCount.Text = (inputSum + 1).ToString();
+            string visualOutboxNo = string.IsNullOrEmpty(row.Cells[1].Value.ToString()) ? row.Cells[7].Value.ToString() : row.Cells[1].Value.ToString();
             int insertCount = ConnectDB.ExecuteInsert($@"INSERT INTO g_packing_sncheck (work_order,part_no,sn,outbox_no,
                             count,update_time,update_name,check_id,rule_name,rule_value,capacity,ISCHECHK_DCR,rule_id) 
-                            VALUES ( '', '', '{row.Cells[0].Value}', '{row.Cells[1].Value}',
+                            VALUES ( '', '', '{row.Cells[0].Value}', '{visualOutboxNo}',
                             '{row.Cells[2].Value}',sysdate,'{_UserName}',packcheckid_seq.NEXTVAL,'{dRules.Text.Trim()}','{curRule}','{dSum.Text}','{row.Cells[5].Value}','{curRuleId}' )");
             if (Convert.ToInt32(dCount.Text) < Convert.ToInt32(dSum.Text))
             {
@@ -415,8 +425,9 @@ namespace UAS_MES_Tools
         private void BoxNo_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode != Keys.Enter) return;
-
-            dt = ConnectDB.ExecuteSelect($@"SELECT * FROM g_packing_sncheck a,g_packing_rules b WHERE a.outbox_no = '{BoxNo.Text}' AND a.rule_id = b.rule_id");
+            
+            string visualOutboxNo = string.IsNullOrEmpty(BoxNo.Text) ? BaseUtil.GetCacheData("VisualOutboxNo").ToString() : BoxNo.Text.Trim();
+            dt = ConnectDB.ExecuteSelect($@"SELECT * FROM g_packing_sncheck a,g_packing_rules b WHERE a.outbox_no = '{visualOutboxNo}' AND a.rule_id = b.rule_id");
             if (dt.Rows.Count > 0)
             {
                 if (Convert.ToInt32(dt.Rows[0]["CAPACITY"].ToString()) > dt.Rows.Count)
@@ -454,7 +465,7 @@ namespace UAS_MES_Tools
                 {
                     BoxNo.Focus();
                     BoxNo.SelectAll();
-                    MessageBox.Show($"核对完成,此箱{BoxNo.Text} 已装满{dt.Rows[0]["CAPACITY"].ToString()} 个,请扫描未核对箱号", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    MessageBox.Show($"核对完成,此箱{visualOutboxNo} 已装满{dt.Rows[0]["CAPACITY"].ToString()} 个,请扫描未核对箱号", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     BoxNo.Text = "";
                     return;
                 }

UAS_Tools_HY/Main.resx

@@ -138,6 +138,9 @@
   <metadata name="Dresult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="visualOutboxNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ruleId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>