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

UAS_MES_HYSX/FunctionCode/Make/Make_HandFeedRegistration.Designer.cs

@@ -28,6 +28,28 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.containerBox = new System.Windows.Forms.Panel();
+            this.executeBox = new System.Windows.Forms.Panel();
+            this.handCount = new System.Windows.Forms.Label();
+            this.submit = new System.Windows.Forms.Button();
+            this.query = new System.Windows.Forms.Button();
+            this.machineVal = new System.Windows.Forms.ComboBox();
+            this.machineLab = new System.Windows.Forms.Label();
+            this.snVal = new System.Windows.Forms.TextBox();
+            this.snLab = new System.Windows.Forms.Label();
+            this.dgv = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.productName = new System.Windows.Forms.Label();
@@ -38,16 +60,6 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.serialNumber = new System.Windows.Forms.Label();
-            this.containerBox = new System.Windows.Forms.Panel();
-            this.dgv = new System.Windows.Forms.DataGridView();
-            this.executeBox = new System.Windows.Forms.Panel();
-            this.handCount = new System.Windows.Forms.Label();
-            this.submit = new System.Windows.Forms.Button();
-            this.query = new System.Windows.Forms.Button();
-            this.machineVal = new System.Windows.Forms.ComboBox();
-            this.machineLab = new System.Windows.Forms.Label();
-            this.snVal = new System.Windows.Forms.TextBox();
-            this.snLab = new System.Windows.Forms.Label();
             this.rn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.isHandReel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.ms_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -58,13 +70,242 @@
             this.psl_bomlocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.psl_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.psl_baseqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SNDetails.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
+            this.ReelRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ReelNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.containerBox.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
             this.executeBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
+            // containerBox
+            // 
+            this.containerBox.Controls.Add(this.executeBox);
+            this.containerBox.Controls.Add(this.dgv);
+            this.containerBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.containerBox.Location = new System.Drawing.Point(0, 123);
+            this.containerBox.Name = "containerBox";
+            this.containerBox.Size = new System.Drawing.Size(1600, 777);
+            this.containerBox.TabIndex = 28;
+            // 
+            // executeBox
+            // 
+            this.executeBox.Controls.Add(this.handCount);
+            this.executeBox.Controls.Add(this.submit);
+            this.executeBox.Controls.Add(this.query);
+            this.executeBox.Controls.Add(this.machineVal);
+            this.executeBox.Controls.Add(this.machineLab);
+            this.executeBox.Controls.Add(this.snVal);
+            this.executeBox.Controls.Add(this.snLab);
+            this.executeBox.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.executeBox.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.executeBox.Location = new System.Drawing.Point(0, 647);
+            this.executeBox.Name = "executeBox";
+            this.executeBox.Size = new System.Drawing.Size(1600, 130);
+            this.executeBox.TabIndex = 0;
+            // 
+            // handCount
+            // 
+            this.handCount.AutoSize = true;
+            this.handCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.handCount.Location = new System.Drawing.Point(935, 24);
+            this.handCount.Name = "handCount";
+            this.handCount.Size = new System.Drawing.Size(117, 28);
+            this.handCount.TabIndex = 6;
+            this.handCount.Text = "补料数量：";
+            // 
+            // submit
+            // 
+            this.submit.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.submit.Location = new System.Drawing.Point(1033, 18);
+            this.submit.Name = "submit";
+            this.submit.Size = new System.Drawing.Size(140, 32);
+            this.submit.TabIndex = 5;
+            this.submit.Text = "提交手补料";
+            this.submit.UseVisualStyleBackColor = true;
+            this.submit.Click += new System.EventHandler(this.submit_Click);
+            // 
+            // query
+            // 
+            this.query.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.query.Location = new System.Drawing.Point(837, 18);
+            this.query.Name = "query";
+            this.query.Size = new System.Drawing.Size(80, 32);
+            this.query.TabIndex = 4;
+            this.query.Text = "查询";
+            this.query.UseVisualStyleBackColor = true;
+            this.query.Click += new System.EventHandler(this.query_Click);
+            // 
+            // machineVal
+            // 
+            this.machineVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.machineVal.FormattingEnabled = true;
+            this.machineVal.Location = new System.Drawing.Point(492, 20);
+            this.machineVal.Name = "machineVal";
+            this.machineVal.Size = new System.Drawing.Size(327, 32);
+            this.machineVal.TabIndex = 3;
+            // 
+            // machineLab
+            // 
+            this.machineLab.AutoSize = true;
+            this.machineLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.machineLab.Location = new System.Drawing.Point(397, 20);
+            this.machineLab.Name = "machineLab";
+            this.machineLab.Size = new System.Drawing.Size(101, 28);
+            this.machineLab.TabIndex = 2;
+            this.machineLab.Text = "机台名称:";
+            // 
+            // snVal
+            // 
+            this.snVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.snVal.Location = new System.Drawing.Point(114, 20);
+            this.snVal.Name = "snVal";
+            this.snVal.Size = new System.Drawing.Size(263, 31);
+            this.snVal.TabIndex = 1;
+            this.snVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.snVal_KeyDown);
+            // 
+            // snLab
+            // 
+            this.snLab.AutoSize = true;
+            this.snLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.snLab.Location = new System.Drawing.Point(38, 20);
+            this.snLab.Name = "snLab";
+            this.snLab.Size = new System.Drawing.Size(80, 28);
+            this.snLab.TabIndex = 0;
+            this.snLab.Text = "序列号:";
+            // 
+            // dgv
+            // 
+            this.dgv.AllowUserToAddRows = false;
+            this.dgv.AllowUserToDeleteRows = false;
+            this.dgv.AllowUserToResizeRows = false;
+            this.dgv.BackgroundColor = System.Drawing.SystemColors.Control;
+            this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.rn,
+            this.isHandReel,
+            this.ms_sncode,
+            this.ps_linecode,
+            this.ps_processcode,
+            this.ps_table,
+            this.psl_location,
+            this.psl_bomlocation,
+            this.psl_prodcode,
+            this.psl_baseqty,
+            this.ReelRemark,
+            this.ReelNum});
+            this.dgv.Dock = System.Windows.Forms.DockStyle.Top;
+            this.dgv.Location = new System.Drawing.Point(0, 0);
+            this.dgv.Name = "dgv";
+            this.dgv.RowHeadersVisible = false;
+            this.dgv.RowHeadersWidth = 62;
+            this.dgv.RowTemplate.Height = 30;
+            this.dgv.Size = new System.Drawing.Size(1600, 641);
+            this.dgv.TabIndex = 1;
+            this.dgv.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv_CellClick);
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "rn";
+            this.dataGridViewTextBoxColumn1.HeaderText = "序号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 60;
+            // 
+            // dataGridViewCheckBoxColumn1
+            // 
+            this.dataGridViewCheckBoxColumn1.HeaderText = "是否手补料";
+            this.dataGridViewCheckBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+            this.dataGridViewCheckBoxColumn1.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "ms_sncode";
+            this.dataGridViewTextBoxColumn2.HeaderText = "序列号";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 130;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "ps_linecode";
+            this.dataGridViewTextBoxColumn3.HeaderText = "线体";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "ps_processcode";
+            this.dataGridViewTextBoxColumn4.HeaderText = "机台名称";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Width = 190;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "ps_table";
+            this.dataGridViewTextBoxColumn5.HeaderText = "面别";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "psl_location";
+            this.dataGridViewTextBoxColumn6.HeaderText = "站位编号";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "psl_bomlocation";
+            this.dataGridViewTextBoxColumn7.HeaderText = "元件位置";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.Width = 210;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "psl_prodcode";
+            this.dataGridViewTextBoxColumn8.HeaderText = "物料编号";
+            this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.Width = 140;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "psl_baseqty";
+            this.dataGridViewTextBoxColumn9.HeaderText = "单位用量";
+            this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            this.dataGridViewTextBoxColumn9.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.HeaderText = "元件信息备注";
+            this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.HeaderText = "补料数量";
+            this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.Width = 80;
+            // 
             // SNDetails
             // 
             this.SNDetails.BorderColor = System.Drawing.Color.Black;
@@ -191,130 +432,6 @@
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // containerBox
-            // 
-            this.containerBox.Controls.Add(this.executeBox);
-            this.containerBox.Controls.Add(this.dgv);
-            this.containerBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.containerBox.Location = new System.Drawing.Point(0, 123);
-            this.containerBox.Name = "containerBox";
-            this.containerBox.Size = new System.Drawing.Size(1600, 777);
-            this.containerBox.TabIndex = 28;
-            // 
-            // dgv
-            // 
-            this.dgv.AllowUserToAddRows = false;
-            this.dgv.AllowUserToDeleteRows = false;
-            this.dgv.AllowUserToResizeRows = false;
-            this.dgv.BackgroundColor = System.Drawing.SystemColors.Control;
-            this.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.rn,
-            this.isHandReel,
-            this.ms_sncode,
-            this.ps_linecode,
-            this.ps_processcode,
-            this.ps_table,
-            this.psl_location,
-            this.psl_bomlocation,
-            this.psl_prodcode,
-            this.psl_baseqty});
-            this.dgv.Dock = System.Windows.Forms.DockStyle.Top;
-            this.dgv.Location = new System.Drawing.Point(0, 0);
-            this.dgv.Name = "dgv";
-            this.dgv.RowHeadersVisible = false;
-            this.dgv.RowHeadersWidth = 62;
-            this.dgv.RowTemplate.Height = 30;
-            this.dgv.Size = new System.Drawing.Size(1600, 641);
-            this.dgv.TabIndex = 1;
-            this.dgv.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv_CellClick);
-            // 
-            // executeBox
-            // 
-            this.executeBox.Controls.Add(this.handCount);
-            this.executeBox.Controls.Add(this.submit);
-            this.executeBox.Controls.Add(this.query);
-            this.executeBox.Controls.Add(this.machineVal);
-            this.executeBox.Controls.Add(this.machineLab);
-            this.executeBox.Controls.Add(this.snVal);
-            this.executeBox.Controls.Add(this.snLab);
-            this.executeBox.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.executeBox.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.executeBox.Location = new System.Drawing.Point(0, 647);
-            this.executeBox.Name = "executeBox";
-            this.executeBox.Size = new System.Drawing.Size(1600, 130);
-            this.executeBox.TabIndex = 0;
-            // 
-            // handCount
-            // 
-            this.handCount.AutoSize = true;
-            this.handCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.handCount.Location = new System.Drawing.Point(935, 24);
-            this.handCount.Name = "handCount";
-            this.handCount.Size = new System.Drawing.Size(117, 28);
-            this.handCount.TabIndex = 6;
-            this.handCount.Text = "补料数量：";
-            // 
-            // submit
-            // 
-            this.submit.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.submit.Location = new System.Drawing.Point(1033, 18);
-            this.submit.Name = "submit";
-            this.submit.Size = new System.Drawing.Size(140, 32);
-            this.submit.TabIndex = 5;
-            this.submit.Text = "提交手补料";
-            this.submit.UseVisualStyleBackColor = true;
-            this.submit.Click += new System.EventHandler(this.submit_Click);
-            // 
-            // query
-            // 
-            this.query.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.query.Location = new System.Drawing.Point(837, 18);
-            this.query.Name = "query";
-            this.query.Size = new System.Drawing.Size(80, 32);
-            this.query.TabIndex = 4;
-            this.query.Text = "查询";
-            this.query.UseVisualStyleBackColor = true;
-            this.query.Click += new System.EventHandler(this.query_Click);
-            // 
-            // machineVal
-            // 
-            this.machineVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.machineVal.FormattingEnabled = true;
-            this.machineVal.Location = new System.Drawing.Point(492, 20);
-            this.machineVal.Name = "machineVal";
-            this.machineVal.Size = new System.Drawing.Size(327, 32);
-            this.machineVal.TabIndex = 3;
-            // 
-            // machineLab
-            // 
-            this.machineLab.AutoSize = true;
-            this.machineLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.machineLab.Location = new System.Drawing.Point(397, 20);
-            this.machineLab.Name = "machineLab";
-            this.machineLab.Size = new System.Drawing.Size(101, 28);
-            this.machineLab.TabIndex = 2;
-            this.machineLab.Text = "机台名称:";
-            // 
-            // snVal
-            // 
-            this.snVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.snVal.Location = new System.Drawing.Point(114, 20);
-            this.snVal.Name = "snVal";
-            this.snVal.Size = new System.Drawing.Size(263, 31);
-            this.snVal.TabIndex = 1;
-            this.snVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.snVal_KeyDown);
-            // 
-            // snLab
-            // 
-            this.snLab.AutoSize = true;
-            this.snLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.snLab.Location = new System.Drawing.Point(38, 20);
-            this.snLab.Name = "snLab";
-            this.snLab.Size = new System.Drawing.Size(80, 28);
-            this.snLab.TabIndex = 0;
-            this.snLab.Text = "序列号:";
-            // 
             // rn
             // 
             this.rn.DataPropertyName = "rn";
@@ -346,6 +463,7 @@
             this.ps_linecode.MinimumWidth = 8;
             this.ps_linecode.Name = "ps_linecode";
             this.ps_linecode.ReadOnly = true;
+            this.ps_linecode.Width = 150;
             // 
             // ps_processcode
             // 
@@ -399,6 +517,23 @@
             this.psl_baseqty.MinimumWidth = 8;
             this.psl_baseqty.Name = "psl_baseqty";
             this.psl_baseqty.ReadOnly = true;
+            this.psl_baseqty.Width = 80;
+            // 
+            // ReelRemark
+            // 
+            this.ReelRemark.DataPropertyName = "ReelRemark";
+            this.ReelRemark.HeaderText = "元件信息备注";
+            this.ReelRemark.MinimumWidth = 8;
+            this.ReelRemark.Name = "ReelRemark";
+            this.ReelRemark.Width = 150;
+            // 
+            // ReelNum
+            // 
+            this.ReelNum.DataPropertyName = "ReelNum";
+            this.ReelNum.HeaderText = "补料数量";
+            this.ReelNum.MinimumWidth = 8;
+            this.ReelNum.Name = "ReelNum";
+            this.ReelNum.Width = 80;
             // 
             // Make_HandFeedRegistration
             // 
@@ -413,13 +548,13 @@
             this.Name = "Make_HandFeedRegistration";
             this.Text = "Make_HandFeedRegistration";
             this.Load += new System.EventHandler(this.Make_HandFeedRegistration_Load);
-            this.SNDetails.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
             this.containerBox.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
             this.executeBox.ResumeLayout(false);
             this.executeBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit();
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -456,5 +591,19 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_bomlocation;
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_prodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_baseqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ReelRemark;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ReelNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_HandFeedRegistration.cs

@@ -97,7 +97,7 @@ namespace UAS_MES_NEW.Make
 
             SQL.Clear();
             SQL.Append($@"SELECT rownum rn,ms_sncode,ps_linecode,
-                ps_processcode,ps_table,psl_location,psl_bomlocation,psl_prodcode,psl_baseqty 
+                ps_processcode,ps_table,psl_location,psl_bomlocation,psl_prodcode,psl_baseqty, '' ReelRemark, '' ReelNum
                 FROM makeserial a,productsmt b,productsmtlocation c
                 WHERE a.ms_sncode = '{snVal.Text}' AND b.ps_processcode = '{machineVal.Text}'
                 AND a.ms_prodcode = b.ps_prodcode AND b.ps_id = c.psl_psid ORDER BY psl_detno");
@@ -182,14 +182,44 @@ namespace UAS_MES_NEW.Make
             upLoadDatas.Columns.Add(new DataColumn("psl_prodcode"));
             upLoadDatas.Columns.Add(new DataColumn("psl_baseqty"));
 
+            upLoadDatas.Columns.Add(new DataColumn("ReelRemark"));
+            upLoadDatas.Columns.Add(new DataColumn("ReelNum"));
+
+            bool flag = false;
             foreach (DataGridViewRow item in dgv.Rows)
             {
                 var checkCell = item.Cells["isHandReel"] as DataGridViewCheckBoxCell;
                 if (Convert.ToBoolean(checkCell.Value))
                 {
+                    string remark = string.IsNullOrEmpty(item.Cells["ReelRemark"].Value.ToString()) ? "" : item.Cells["ReelRemark"].Value.ToString().ToUpper();
+                    if (!string.IsNullOrEmpty(remark))
+                    {
+                        string[] positonArr = item.Cells["psl_bomlocation"].Value.ToString().Split(',');
+                        foreach(string str in positonArr)
+                        {
+                            if (remark.Contains(str.Trim()))
+                            {
+                                flag = true;
+                            }
+                        }
+                        if (!flag)
+                        {
+                            MessageBox.Show("请填写对应补料元件位置", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                            return;
+                        }
+                    }
+
+                    int num = string.IsNullOrEmpty(item.Cells["ReelNum"].Value.ToString()) ? 1 : Convert.ToInt32(item.Cells["ReelNum"].Value);
+                    if (num > Convert.ToInt32(item.Cells["psl_baseqty"].Value.ToString()))
+                    {
+                        MessageBox.Show("补料数量不得大于单位用量", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        return;
+                    }
+
                     upLoadDatas.Rows.Add(item.Cells["rn"].Value, item.Cells["ms_sncode"].Value, item.Cells["ps_linecode"].Value, 
                         item.Cells["ps_processcode"].Value, item.Cells["ps_table"].Value, item.Cells["psl_location"].Value,
-                        item.Cells["psl_bomlocation"].Value, item.Cells["psl_prodcode"].Value, item.Cells["psl_baseqty"].Value);
+                        item.Cells["psl_bomlocation"].Value, item.Cells["psl_prodcode"].Value, item.Cells["psl_baseqty"].Value,
+                        remark, item.Cells["ReelNum"].Value);
                 }
             }
             dgv.DataSource = upLoadDatas;
@@ -204,10 +234,10 @@ namespace UAS_MES_NEW.Make
                     SQL.Clear();
                     SQL.Append($@"INSERT INTO smt_handreel_log (serial_number,line_name,machine_name,side,
                     position,reel_position, part_no, reel_qty, 
-                    update_time, update_name) VALUES 
+                    update_time, update_name,REELREMARK,REELNUM) VALUES 
                     ( '{rw.Cells["ms_sncode"].Value}','{rw.Cells["ps_linecode"].Value}','{rw.Cells["ps_processcode"].Value}','{rw.Cells["ps_table"].Value}',
                     '{rw.Cells["psl_location"].Value}','{rw.Cells["psl_bomlocation"].Value}','{rw.Cells["psl_prodcode"].Value}','{rw.Cells["psl_baseqty"].Value}',
-                    sysdate,'{User.UserName}' )");
+                    sysdate,'{User.UserName}','{rw.Cells["ReelRemark"].Value}','{rw.Cells["ReelNum"].Value}' )");
                     dh.ExecuteSql(SQL.ToString(), "insert");
                 }
                 catch (Exception ex)

UAS_MES_HYSX/FunctionCode/Make/Make_HandFeedRegistration.resx

@@ -147,4 +147,10 @@
   <metadata name="psl_baseqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ReelRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ReelNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_MES_HYSX/UAS_MES_HYSX.csproj

@@ -1710,6 +1710,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_HandFeedRegistration.resx">
       <DependentUpon>Make_HandFeedRegistration.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_ImeiCheckZX.resx">
       <DependentUpon>Make_ImeiCheckZX.cs</DependentUpon>