修改设备治具填写

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -82,6 +82,12 @@
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
             this.new_softversion = new System.Windows.Forms.TextBox();
+            this.label11 = new System.Windows.Forms.Label();
+            this.SoftVersion = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.device = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.ob_sendqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.ob_batchqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.ob_nowcheckqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
@@ -109,10 +115,12 @@
             this.bc_remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_groupcode = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.device = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.label11 = new System.Windows.Forms.Label();
+            this.bd_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.version = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.SoftVersion)).BeginInit();
             this.SuspendLayout();
             // 
             // bc_remark_label
@@ -178,7 +186,7 @@
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
             this.GoodProduct.Location = new System.Drawing.Point(12, 983);
-            this.GoodProduct.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.GoodProduct.Margin = new System.Windows.Forms.Padding(5);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(129, 54);
             this.GoodProduct.TabIndex = 35;
@@ -193,7 +201,7 @@
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
             this.Reject.Location = new System.Drawing.Point(165, 983);
-            this.Reject.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Reject.Margin = new System.Windows.Forms.Padding(5);
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(167, 54);
             this.Reject.TabIndex = 36;
@@ -214,7 +222,7 @@
             this.WaitRejectList.FullRowSelect = true;
             this.WaitRejectList.HideSelection = false;
             this.WaitRejectList.Location = new System.Drawing.Point(8, 564);
-            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.WaitRejectList.Margin = new System.Windows.Forms.Padding(5);
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Size = new System.Drawing.Size(528, 408);
             this.WaitRejectList.TabIndex = 37;
@@ -277,7 +285,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(1283, 301);
+            this.label6.Location = new System.Drawing.Point(1290, 517);
             this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(146, 42);
@@ -296,7 +304,7 @@
             this.ChoosedRejectList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ChoosedRejectList.HideSelection = false;
             this.ChoosedRejectList.Location = new System.Drawing.Point(736, 564);
-            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(5);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Size = new System.Drawing.Size(528, 408);
             this.ChoosedRejectList.TabIndex = 50;
@@ -334,8 +342,8 @@
             // 
             this.AutoBadCode.AutoSize = true;
             this.AutoBadCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AutoBadCode.Location = new System.Drawing.Point(1440, 309);
-            this.AutoBadCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.AutoBadCode.Location = new System.Drawing.Point(982, 270);
+            this.AutoBadCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoBadCode.Name = "AutoBadCode";
             this.AutoBadCode.Size = new System.Drawing.Size(238, 35);
             this.AutoBadCode.TabIndex = 69;
@@ -405,7 +413,7 @@
             this.NoteForChange.CheckState = System.Windows.Forms.CheckState.Checked;
             this.NoteForChange.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NoteForChange.Location = new System.Drawing.Point(580, 224);
-            this.NoteForChange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.NoteForChange.Margin = new System.Windows.Forms.Padding(4);
             this.NoteForChange.Name = "NoteForChange";
             this.NoteForChange.Size = new System.Drawing.Size(190, 35);
             this.NoteForChange.TabIndex = 75;
@@ -452,7 +460,7 @@
             this.SMTBind.CheckState = System.Windows.Forms.CheckState.Checked;
             this.SMTBind.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.SMTBind.Location = new System.Drawing.Point(1485, 258);
-            this.SMTBind.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SMTBind.Margin = new System.Windows.Forms.Padding(4);
             this.SMTBind.Name = "SMTBind";
             this.SMTBind.Size = new System.Drawing.Size(193, 35);
             this.SMTBind.TabIndex = 195;
@@ -475,8 +483,8 @@
             // 
             this.StopWatch.Enabled = false;
             this.StopWatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StopWatch.Location = new System.Drawing.Point(1040, 451);
-            this.StopWatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StopWatch.Location = new System.Drawing.Point(760, 451);
+            this.StopWatch.Margin = new System.Windows.Forms.Padding(4);
             this.StopWatch.Name = "StopWatch";
             this.StopWatch.Size = new System.Drawing.Size(128, 56);
             this.StopWatch.TabIndex = 207;
@@ -487,8 +495,8 @@
             // StartWatch
             // 
             this.StartWatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StartWatch.Location = new System.Drawing.Point(816, 451);
-            this.StartWatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StartWatch.Location = new System.Drawing.Point(591, 451);
+            this.StartWatch.Margin = new System.Windows.Forms.Padding(4);
             this.StartWatch.Name = "StartWatch";
             this.StartWatch.Size = new System.Drawing.Size(128, 56);
             this.StartWatch.TabIndex = 206;
@@ -499,8 +507,8 @@
             // ChooseFolder
             // 
             this.ChooseFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChooseFolder.Location = new System.Drawing.Point(1096, 372);
-            this.ChooseFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseFolder.Location = new System.Drawing.Point(919, 359);
+            this.ChooseFolder.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseFolder.Name = "ChooseFolder";
             this.ChooseFolder.Size = new System.Drawing.Size(156, 48);
             this.ChooseFolder.TabIndex = 205;
@@ -511,8 +519,8 @@
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-            this.FolderPath.Location = new System.Drawing.Point(760, 380);
-            this.FolderPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.FolderPath.Location = new System.Drawing.Point(591, 369);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(4);
             this.FolderPath.Name = "FolderPath";
             this.FolderPath.Size = new System.Drawing.Size(313, 35);
             this.FolderPath.TabIndex = 204;
@@ -645,12 +653,76 @@
             this.new_softversion.Cursor = System.Windows.Forms.Cursors.Hand;
             this.new_softversion.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.new_softversion.Location = new System.Drawing.Point(165, 225);
-            this.new_softversion.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.new_softversion.Margin = new System.Windows.Forms.Padding(4);
             this.new_softversion.Name = "new_softversion";
             this.new_softversion.Size = new System.Drawing.Size(315, 39);
             this.new_softversion.TabIndex = 243;
             this.new_softversion.KeyDown += new System.Windows.Forms.KeyEventHandler(this.new_softversion_KeyDown);
             // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label11.Location = new System.Drawing.Point(1018, 987);
+            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(82, 41);
+            this.label11.TabIndex = 245;
+            this.label11.Text = "治具";
+            // 
+            // SoftVersion
+            // 
+            this.SoftVersion.AllowUserToAddRows = false;
+            this.SoftVersion.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.SoftVersion.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.bd_soncode,
+            this.pr_spec1,
+            this.version});
+            this.SoftVersion.Location = new System.Drawing.Point(1082, 333);
+            this.SoftVersion.Name = "SoftVersion";
+            this.SoftVersion.RowHeadersWidth = 82;
+            this.SoftVersion.RowTemplate.Height = 37;
+            this.SoftVersion.Size = new System.Drawing.Size(615, 174);
+            this.SoftVersion.TabIndex = 246;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.HeaderText = "料号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.HeaderText = "规格";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.HeaderText = "版本";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 200;
+            // 
+            // device
+            // 
+            this.device.AllPower = "ifall";
+            this.device.BackColor = System.Drawing.Color.White;
+            this.device.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.device.ID = null;
+            this.device.Location = new System.Drawing.Point(1114, 988);
+            this.device.Margin = new System.Windows.Forms.Padding(5);
+            this.device.Name = "device";
+            this.device.Power = null;
+            this.device.Size = new System.Drawing.Size(294, 40);
+            this.device.Str = null;
+            this.device.Str1 = null;
+            this.device.Str2 = null;
+            this.device.TabIndex = 244;
+            this.device.Tag = "IfRead";
+            // 
             // ob_sendqty
             // 
             this.ob_sendqty.AutoSize = true;
@@ -767,7 +839,7 @@
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
             this.SendCheck.Location = new System.Drawing.Point(1265, 203);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
             this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
@@ -806,7 +878,7 @@
             this.Filter.BackColor = System.Drawing.Color.Transparent;
             this.Filter.Font = new System.Drawing.Font("宋体", 10.8F);
             this.Filter.Location = new System.Drawing.Point(187, 515);
-            this.Filter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Filter.Margin = new System.Windows.Forms.Padding(4);
             this.Filter.Name = "Filter";
             this.Filter.PlaceHolder = "不良名称搜索";
             this.Filter.Size = new System.Drawing.Size(352, 44);
@@ -834,7 +906,7 @@
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
             this.Save.Location = new System.Drawing.Point(867, 986);
-            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
@@ -852,7 +924,7 @@
             this.bc_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_code.ID = null;
             this.bc_code.Location = new System.Drawing.Point(188, 443);
-            this.bc_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.bc_code.Margin = new System.Windows.Forms.Padding(5);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
             this.bc_code.Size = new System.Drawing.Size(348, 40);
@@ -870,7 +942,7 @@
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
             this.ma_code.Location = new System.Drawing.Point(187, 27);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(5);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
@@ -889,7 +961,7 @@
             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(448, 29);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4);
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Size = new System.Drawing.Size(94, 35);
             this.LockMakeCode.TabIndex = 66;
@@ -936,10 +1008,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1288, 363);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.OperateResult.Location = new System.Drawing.Point(1288, 564);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(409, 609);
+            this.OperateResult.Size = new System.Drawing.Size(409, 408);
             this.OperateResult.TabIndex = 52;
             this.OperateResult.Text = "";
             // 
@@ -951,7 +1023,7 @@
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
             this.CleanInfo.Location = new System.Drawing.Point(1440, 985);
-            this.CleanInfo.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.CleanInfo.Margin = new System.Windows.Forms.Padding(5);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
             this.CleanInfo.NormalImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.NormalImage")));
@@ -966,7 +1038,7 @@
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
             this.ChooseedReject.Location = new System.Drawing.Point(584, 693);
-            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ChooseedReject.Margin = new System.Windows.Forms.Padding(5);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(100, 45);
             this.ChooseedReject.TabIndex = 45;
@@ -977,7 +1049,7 @@
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
             this.WaitReject.Location = new System.Drawing.Point(584, 820);
-            this.WaitReject.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.WaitReject.Margin = new System.Windows.Forms.Padding(5);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(100, 45);
             this.WaitReject.TabIndex = 44;
@@ -990,7 +1062,7 @@
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
             this.bc_remark.Location = new System.Drawing.Point(1123, 523);
-            this.bc_remark.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.bc_remark.Margin = new System.Windows.Forms.Padding(5);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
             this.bc_remark.Power = null;
@@ -1006,7 +1078,7 @@
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
             this.bc_groupcode.Location = new System.Drawing.Point(188, 364);
-            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.bc_groupcode.Margin = new System.Windows.Forms.Padding(5);
             this.bc_groupcode.Name = "bc_groupcode";
             this.bc_groupcode.Size = new System.Drawing.Size(348, 37);
             this.bc_groupcode.TabIndex = 21;
@@ -1019,7 +1091,7 @@
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
             this.ms_sncode.Location = new System.Drawing.Point(488, 993);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(5);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(359, 40);
@@ -1030,33 +1102,30 @@
             this.ms_sncode.Tag = "IfRead";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown_one);
             // 
-            // device
+            // bd_soncode
             // 
-            this.device.AllPower = "ifall";
-            this.device.BackColor = System.Drawing.Color.White;
-            this.device.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.device.ID = null;
-            this.device.Location = new System.Drawing.Point(1114, 988);
-            this.device.Margin = new System.Windows.Forms.Padding(5);
-            this.device.Name = "device";
-            this.device.Power = null;
-            this.device.Size = new System.Drawing.Size(294, 40);
-            this.device.Str = null;
-            this.device.Str1 = null;
-            this.device.Str2 = null;
-            this.device.TabIndex = 244;
-            this.device.Tag = "IfRead";
+            this.bd_soncode.DataPropertyName = "bd_soncode";
+            this.bd_soncode.HeaderText = "料号";
+            this.bd_soncode.MinimumWidth = 10;
+            this.bd_soncode.Name = "bd_soncode";
+            this.bd_soncode.ReadOnly = true;
+            this.bd_soncode.Width = 200;
             // 
-            // label11
+            // pr_spec1
             // 
-            this.label11.AutoSize = true;
-            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(1018, 987);
-            this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(82, 41);
-            this.label11.TabIndex = 245;
-            this.label11.Text = "治具";
+            this.pr_spec1.DataPropertyName = "pr_spec";
+            this.pr_spec1.HeaderText = "规格";
+            this.pr_spec1.MinimumWidth = 10;
+            this.pr_spec1.Name = "pr_spec1";
+            this.pr_spec1.ReadOnly = true;
+            this.pr_spec1.Width = 200;
+            // 
+            // version
+            // 
+            this.version.HeaderText = "版本";
+            this.version.MinimumWidth = 10;
+            this.version.Name = "version";
+            this.version.Width = 200;
             // 
             // Make_TestCollection
             // 
@@ -1064,6 +1133,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1721, 1051);
+            this.Controls.Add(this.SoftVersion);
             this.Controls.Add(this.label11);
             this.Controls.Add(this.device);
             this.Controls.Add(this.new_softversion);
@@ -1134,7 +1204,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "Make_TestCollection";
             this.Tag = "Make!TestCollection";
             this.Text = " ";
@@ -1144,7 +1214,8 @@
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Make_TestCollection_KeyDown);
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).EndInit();
-            this.ResumeLayout(true);
+            ((System.ComponentModel.ISupportInitialize)(this.SoftVersion)).EndInit();
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -1231,5 +1302,12 @@
         private System.Windows.Forms.TextBox new_softversion;
         private System.Windows.Forms.Label label11;
         private CustomControl.TextBoxWithIcon.SnCollectionBox device;
+        private System.Windows.Forms.DataGridView SoftVersion;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bd_soncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn version;
     }
 }

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.cs

@@ -242,8 +242,13 @@ namespace UAS_MES_NEW.Make
                                 LockMakeCode.Checked = true;
                             }
                         }
-                        if (device.Text != "")
+                        if (dh.getRowCount("PRODUCTDEVICE left join product on pr_id=PDE_PRID", " pr_code='" + ma_prodcode.Text + "'") > 0)
                         {
+                            if (device.Text == "")
+                            {
+                                OperateResult.AppendText("产品已维护工装清单,治具编号必填\n");
+                                return;
+                            }
                             string[] dev = device.Text.Split(',');
                             for (int i = 0; i < dev.Length; i++)
                             {
@@ -252,7 +257,7 @@ namespace UAS_MES_NEW.Make
                                     OperateResult.AppendText("治具编号" + dev[i] + "不存在\n");
                                     return;
                                 }
-                                if (dh.getRowCount("DEVICEDETAIL left join device on de_id=dd_deid", "de_code='" + dev[i] + "' and DD_ORDERCODE='" + ma_prodcode.Text + "'") == 0)
+                                if (dh.getRowCount("PRODUCTDEVICE left join product on pr_id=PDE_PRID", "PDE_DECODE='" + dev[i] + "' and pr_code='" + ma_prodcode.Text + "'") == 0)
                                 {
                                     OperateResult.AppendText("治具编号" + dev[i] + "不允许用在产品编号" + ma_prodcode.Text + "\n");
                                     return;
@@ -261,9 +266,13 @@ namespace UAS_MES_NEW.Make
                         }
                         if (User.CurrentStepName == "程序烧写")
                         {
-                            dh.UpdateByCondition("makeserial", $"MS_SOFTVERSION='{new_softversion.Text.Trim()}'", "ms_sncode='" + ms_sncode.Text + "'");
+                            string soft = "";
+                            for (int i = 0; i < SoftVersion.Rows.Count; i++)
+                            {
+                                soft += SoftVersion.Rows[i].Cells["bd_soncode"].Value.ToString() + "#" + SoftVersion.Rows[i].Cells["version"].Value.ToString() + "|";
+                            }
+                            dh.UpdateByCondition("makeserial", $"MS_SOFTVERSION='{soft.Trim()}'", "ms_sncode='" + ms_sncode.Text + "'");
                         }
-
                         dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
                         string status = dt.Rows[0]["ms_status"].ToString();
                         reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
@@ -324,6 +333,12 @@ namespace UAS_MES_NEW.Make
             bc_groupcode.DisplayMember = "bg_name";
             bc_groupcode.ValueMember = "bg_code";
             bc_groupcode.DataSource = dt;
+
+            sql.Clear();
+            sql.Append("select bd_soncode,pr_spec,' ' version   from bom@ERP left join bomdetail@ERP on bo_id=bd_bomid left join " +
+                "product on pr_code=bd_soncode where bo_mothercode='" + ma_prodcode.Text + "' and substr(bd_soncode,0,2)='PR'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.FillDgvWithDataTable(SoftVersion, dt);
         }
 
 

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.resx

@@ -126,6 +126,15 @@
   <metadata name="XmlWatcher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>329, 17</value>
   </metadata>
+  <metadata name="bd_soncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_spec1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SendCheck.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -262,7 +271,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN