调整完善手补料

UAS_MES_YTDZ/FunctionCode/Make/Make_HandFeedRegistration.Designer.cs

@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             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();
@@ -37,19 +38,6 @@
             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.rn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.isHandReel = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.ms_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ps_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ps_processcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ps_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.psl_location = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            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.ReelRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ReelNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -62,6 +50,7 @@
             this.dataGridViewTextBoxColumn9 = 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.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.productName = new System.Windows.Forms.Label();
@@ -72,9 +61,22 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.serialNumber = 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();
+            this.ps_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ps_processcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ps_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_location = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_devlocation = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.psl_baseqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ReelRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ReelNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.containerBox.SuspendLayout();
-            this.executeBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
+            this.executeBox.SuspendLayout();
             this.SNDetails.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
@@ -89,6 +91,37 @@
             this.containerBox.Size = new System.Drawing.Size(1280, 597);
             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_devlocation,
+            this.psl_prodcode,
+            this.pr_detail,
+            this.psl_baseqty,
+            this.ReelRemark,
+            this.ReelNum});
+            this.dgv.Dock = System.Windows.Forms.DockStyle.Fill;
+            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(1280, 467);
+            this.dgv.TabIndex = 1;
+            this.dgv.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv_CellClick);
+            // 
             // executeBox
             // 
             this.executeBox.Controls.Add(this.handCount);
@@ -145,6 +178,7 @@
             this.machineVal.Name = "machineVal";
             this.machineVal.Size = new System.Drawing.Size(327, 32);
             this.machineVal.TabIndex = 3;
+            this.machineVal.Visible = false;
             // 
             // machineLab
             // 
@@ -155,6 +189,7 @@
             this.machineLab.Size = new System.Drawing.Size(101, 28);
             this.machineLab.TabIndex = 2;
             this.machineLab.Text = "机台名称:";
+            this.machineLab.Visible = false;
             // 
             // snVal
             // 
@@ -175,140 +210,6 @@
             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.Fill;
-            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(1280, 467);
-            this.dgv.TabIndex = 1;
-            this.dgv.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv_CellClick);
-            // 
-            // rn
-            // 
-            this.rn.DataPropertyName = "rn";
-            this.rn.HeaderText = "序号";
-            this.rn.MinimumWidth = 8;
-            this.rn.Name = "rn";
-            this.rn.Width = 50;
-            // 
-            // isHandReel
-            // 
-            this.isHandReel.HeaderText = "是否手补料";
-            this.isHandReel.MinimumWidth = 8;
-            this.isHandReel.Name = "isHandReel";
-            this.isHandReel.Width = 50;
-            // 
-            // ms_sncode
-            // 
-            this.ms_sncode.DataPropertyName = "ms_sncode";
-            this.ms_sncode.HeaderText = "序列号";
-            this.ms_sncode.MinimumWidth = 8;
-            this.ms_sncode.Name = "ms_sncode";
-            this.ms_sncode.ReadOnly = true;
-            this.ms_sncode.Width = 130;
-            // 
-            // ps_linecode
-            // 
-            this.ps_linecode.DataPropertyName = "ps_linecode";
-            this.ps_linecode.HeaderText = "线体";
-            this.ps_linecode.MinimumWidth = 8;
-            this.ps_linecode.Name = "ps_linecode";
-            this.ps_linecode.ReadOnly = true;
-            this.ps_linecode.Width = 150;
-            // 
-            // ps_processcode
-            // 
-            this.ps_processcode.DataPropertyName = "ps_processcode";
-            this.ps_processcode.HeaderText = "机台名称";
-            this.ps_processcode.MinimumWidth = 8;
-            this.ps_processcode.Name = "ps_processcode";
-            this.ps_processcode.ReadOnly = true;
-            this.ps_processcode.Width = 190;
-            // 
-            // ps_table
-            // 
-            this.ps_table.DataPropertyName = "ps_table";
-            this.ps_table.HeaderText = "面别";
-            this.ps_table.MinimumWidth = 8;
-            this.ps_table.Name = "ps_table";
-            this.ps_table.ReadOnly = true;
-            this.ps_table.Width = 50;
-            // 
-            // psl_location
-            // 
-            this.psl_location.DataPropertyName = "psl_location";
-            this.psl_location.HeaderText = "站位编号";
-            this.psl_location.MinimumWidth = 8;
-            this.psl_location.Name = "psl_location";
-            this.psl_location.ReadOnly = true;
-            this.psl_location.Width = 80;
-            // 
-            // psl_bomlocation
-            // 
-            this.psl_bomlocation.DataPropertyName = "psl_bomlocation";
-            this.psl_bomlocation.HeaderText = "元件位置";
-            this.psl_bomlocation.MinimumWidth = 8;
-            this.psl_bomlocation.Name = "psl_bomlocation";
-            this.psl_bomlocation.ReadOnly = true;
-            this.psl_bomlocation.Width = 210;
-            // 
-            // psl_prodcode
-            // 
-            this.psl_prodcode.DataPropertyName = "psl_prodcode";
-            this.psl_prodcode.HeaderText = "物料编号";
-            this.psl_prodcode.MinimumWidth = 8;
-            this.psl_prodcode.Name = "psl_prodcode";
-            this.psl_prodcode.ReadOnly = true;
-            this.psl_prodcode.Width = 140;
-            // 
-            // psl_baseqty
-            // 
-            this.psl_baseqty.DataPropertyName = "psl_baseqty";
-            this.psl_baseqty.HeaderText = "单位用量";
-            this.psl_baseqty.MinimumWidth = 8;
-            this.psl_baseqty.Name = "psl_baseqty";
-            this.psl_baseqty.ReadOnly = true;
-            this.psl_baseqty.Width = 60;
-            // 
-            // 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.Visible = false;
-            this.ReelNum.Width = 80;
-            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "rn";
@@ -349,6 +250,7 @@
             this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Visible = false;
             this.dataGridViewTextBoxColumn4.Width = 190;
             // 
             // dataGridViewTextBoxColumn5
@@ -402,6 +304,7 @@
             this.dataGridViewTextBoxColumn10.HeaderText = "元件信息备注";
             this.dataGridViewTextBoxColumn10.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
             this.dataGridViewTextBoxColumn10.Width = 150;
             // 
             // dataGridViewTextBoxColumn11
@@ -410,8 +313,18 @@
             this.dataGridViewTextBoxColumn11.HeaderText = "补料数量";
             this.dataGridViewTextBoxColumn11.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.Visible = false;
             this.dataGridViewTextBoxColumn11.Width = 80;
             // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "ReelNum";
+            this.dataGridViewTextBoxColumn12.HeaderText = "补料数量";
+            this.dataGridViewTextBoxColumn12.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.Visible = false;
+            this.dataGridViewTextBoxColumn12.Width = 80;
+            // 
             // SNDetails
             // 
             this.SNDetails.BorderColor = System.Drawing.Color.Black;
@@ -538,6 +451,118 @@
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
+            // rn
+            // 
+            this.rn.DataPropertyName = "rn";
+            this.rn.HeaderText = "序号";
+            this.rn.MinimumWidth = 8;
+            this.rn.Name = "rn";
+            this.rn.Width = 50;
+            // 
+            // isHandReel
+            // 
+            this.isHandReel.HeaderText = "是否手补料";
+            this.isHandReel.MinimumWidth = 8;
+            this.isHandReel.Name = "isHandReel";
+            this.isHandReel.Width = 50;
+            // 
+            // ms_sncode
+            // 
+            this.ms_sncode.DataPropertyName = "ms_sncode";
+            this.ms_sncode.HeaderText = "序列号";
+            this.ms_sncode.MinimumWidth = 8;
+            this.ms_sncode.Name = "ms_sncode";
+            this.ms_sncode.ReadOnly = true;
+            this.ms_sncode.Width = 160;
+            // 
+            // ps_linecode
+            // 
+            this.ps_linecode.DataPropertyName = "ps_linecode";
+            this.ps_linecode.HeaderText = "线体";
+            this.ps_linecode.MinimumWidth = 8;
+            this.ps_linecode.Name = "ps_linecode";
+            this.ps_linecode.ReadOnly = true;
+            // 
+            // ps_processcode
+            // 
+            this.ps_processcode.DataPropertyName = "ps_processcode";
+            this.ps_processcode.HeaderText = "机台名称";
+            this.ps_processcode.MinimumWidth = 8;
+            this.ps_processcode.Name = "ps_processcode";
+            this.ps_processcode.ReadOnly = true;
+            this.ps_processcode.Visible = false;
+            this.ps_processcode.Width = 190;
+            // 
+            // ps_table
+            // 
+            this.ps_table.DataPropertyName = "ps_table";
+            this.ps_table.HeaderText = "面别";
+            this.ps_table.MinimumWidth = 8;
+            this.ps_table.Name = "ps_table";
+            this.ps_table.ReadOnly = true;
+            this.ps_table.Width = 50;
+            // 
+            // psl_location
+            // 
+            this.psl_location.DataPropertyName = "psl_location";
+            this.psl_location.HeaderText = "站位编号";
+            this.psl_location.MinimumWidth = 8;
+            this.psl_location.Name = "psl_location";
+            this.psl_location.ReadOnly = true;
+            this.psl_location.Width = 120;
+            // 
+            // psl_devlocation
+            // 
+            this.psl_devlocation.DataPropertyName = "psl_devlocation";
+            this.psl_devlocation.HeaderText = "元件位置";
+            this.psl_devlocation.MinimumWidth = 8;
+            this.psl_devlocation.Name = "psl_devlocation";
+            this.psl_devlocation.ReadOnly = true;
+            this.psl_devlocation.Width = 220;
+            // 
+            // psl_prodcode
+            // 
+            this.psl_prodcode.DataPropertyName = "psl_prodcode";
+            this.psl_prodcode.HeaderText = "物料编号";
+            this.psl_prodcode.MinimumWidth = 8;
+            this.psl_prodcode.Name = "psl_prodcode";
+            this.psl_prodcode.ReadOnly = true;
+            this.psl_prodcode.Width = 140;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "物料名称";
+            this.pr_detail.MinimumWidth = 8;
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Width = 150;
+            // 
+            // psl_baseqty
+            // 
+            this.psl_baseqty.DataPropertyName = "psl_baseqty";
+            this.psl_baseqty.HeaderText = "单位用量";
+            this.psl_baseqty.MinimumWidth = 8;
+            this.psl_baseqty.Name = "psl_baseqty";
+            this.psl_baseqty.ReadOnly = true;
+            this.psl_baseqty.Width = 60;
+            // 
+            // 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.Visible = false;
+            this.ReelNum.Width = 80;
+            // 
             // Make_HandFeedRegistration
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -552,9 +577,9 @@
             this.Text = "Make_HandFeedRegistration";
             this.Load += new System.EventHandler(this.Make_HandFeedRegistration_Load);
             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();
@@ -603,10 +628,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ps_processcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn ps_table;
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_location;
-        private System.Windows.Forms.DataGridViewTextBoxColumn psl_bomlocation;
+        private System.Windows.Forms.DataGridViewTextBoxColumn psl_devlocation;
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn psl_baseqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn ReelRemark;
         private System.Windows.Forms.DataGridViewTextBoxColumn ReelNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
     }
 }

UAS_MES_YTDZ/FunctionCode/Make/Make_HandFeedRegistration.cs

@@ -88,19 +88,25 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            if (string.IsNullOrEmpty(machineVal.Text))
+            /*if (string.IsNullOrEmpty(machineVal.Text))
             {
                 MessageBox.Show("请选择机台名称", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 machineVal.SelectAll();
                 return;
-            }
+            }*/
 
             SQL.Clear();
-            SQL.Append($@"SELECT rownum rn,ms_sncode,ps_linecode,
+            /*SQL.Append($@"SELECT rownum rn,ms_sncode,ps_linecode,
                 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");
+                AND a.ms_prodcode = b.ps_prodcode AND b.ps_id = c.psl_psid ORDER BY psl_detno");*/
+
+
+            SQL.Append($@"SELECT rownum rn,ms_sncode,ps_linecode,
+                ps_processcode,ps_table,psl_location,psl_devlocation,psl_prodcode,psl_baseqty, '' ReelRemark, '' ReelNum,pr_detail
+                FROM makeserial a,productsmt b,productsmtlocation c,product d
+                WHERE a.ms_sncode = '{snVal.Text}' AND a.ms_prodcode = b.ps_prodcode AND b.ps_id = c.psl_psid AND c.psl_prodcode = d.pr_code ORDER BY psl_detno");
             dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
             if (dt.Rows.Count > 0)
             {

UAS_MES_YTDZ/FunctionCode/Make/Make_HandFeedRegistration.resx

@@ -138,12 +138,15 @@
   <metadata name="psl_location.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="psl_bomlocation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="psl_devlocation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="psl_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="psl_baseqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>