Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.Designer.cs

@@ -64,6 +64,11 @@
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.WeighRecord = new System.Windows.Forms.ListView();
+            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.panel6.SuspendLayout();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
@@ -73,10 +78,10 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(41, 302);
+            this.ma_code_label.Location = new System.Drawing.Point(46, 362);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_code_label.Size = new System.Drawing.Size(137, 39);
             this.ma_code_label.TabIndex = 97;
             this.ma_code_label.Text = "制造单号";
             // 
@@ -87,10 +92,10 @@
             this.panel6.Controls.Add(this.pr_code);
             this.panel6.Controls.Add(this.pr_cartongw_label);
             this.panel6.Controls.Add(this.pr_code_label);
-            this.panel6.Location = new System.Drawing.Point(563, 95);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel6.Location = new System.Drawing.Point(633, 114);
+            this.panel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(537, 156);
+            this.panel6.Size = new System.Drawing.Size(604, 187);
             this.panel6.TabIndex = 90;
             // 
             // pr_cartongw
@@ -98,11 +103,11 @@
             this.pr_cartongw.AutoSize = true;
             this.pr_cartongw.CutLength = null;
             this.pr_cartongw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw.Location = new System.Drawing.Point(205, 91);
+            this.pr_cartongw.Location = new System.Drawing.Point(231, 109);
             this.pr_cartongw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_cartongw.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_cartongw.MaximumSize = new System.Drawing.Size(225, 0);
             this.pr_cartongw.Name = "pr_cartongw";
-            this.pr_cartongw.Size = new System.Drawing.Size(0, 32);
+            this.pr_cartongw.Size = new System.Drawing.Size(0, 39);
             this.pr_cartongw.TabIndex = 80;
             this.pr_cartongw.Tag = "1";
             // 
@@ -111,11 +116,11 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(205, 28);
+            this.pr_code.Location = new System.Drawing.Point(231, 34);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(225, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 32);
+            this.pr_code.Size = new System.Drawing.Size(0, 39);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
@@ -124,10 +129,10 @@
             // 
             this.pr_cartongw_label.AutoSize = true;
             this.pr_cartongw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartongw_label.Location = new System.Drawing.Point(37, 91);
+            this.pr_cartongw_label.Location = new System.Drawing.Point(42, 109);
             this.pr_cartongw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartongw_label.Name = "pr_cartongw_label";
-            this.pr_cartongw_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_cartongw_label.Size = new System.Drawing.Size(137, 39);
             this.pr_cartongw_label.TabIndex = 42;
             this.pr_cartongw_label.Text = "标准重量";
             // 
@@ -135,10 +140,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(36, 28);
+            this.pr_code_label.Location = new System.Drawing.Point(40, 34);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_code_label.Size = new System.Drawing.Size(137, 39);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -148,10 +153,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(33, 95);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel4.Location = new System.Drawing.Point(37, 114);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(495, 156);
+            this.panel4.Size = new System.Drawing.Size(557, 187);
             this.panel4.TabIndex = 91;
             // 
             // pr_cartonunit
@@ -160,10 +165,10 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(409, 64);
+            this.pr_cartonunit.Location = new System.Drawing.Point(460, 77);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(38, 31);
+            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             // 
@@ -173,10 +178,10 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(20, 64);
+            this.label22.Location = new System.Drawing.Point(22, 77);
             this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
+            this.label22.Size = new System.Drawing.Size(75, 38);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -188,20 +193,20 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(139, 54);
+            this.weight.Location = new System.Drawing.Point(156, 65);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 50);
+            this.weight.Size = new System.Drawing.Size(0, 58);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(35, 30);
+            this.label15.Location = new System.Drawing.Point(39, 36);
             this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(77, 39);
+            this.label15.Size = new System.Drawing.Size(92, 46);
             this.label15.TabIndex = 85;
             this.label15.Text = "箱号";
             // 
@@ -209,10 +214,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(41, 502);
+            this.pr_detail_label.Location = new System.Drawing.Point(46, 602);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_detail_label.Size = new System.Drawing.Size(137, 39);
             this.pr_detail_label.TabIndex = 82;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -220,10 +225,10 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(41, 606);
+            this.ma_qty_label.Location = new System.Drawing.Point(46, 727);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_qty_label.Size = new System.Drawing.Size(137, 39);
             this.ma_qty_label.TabIndex = 84;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -231,10 +236,10 @@
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode_label.Location = new System.Drawing.Point(41, 401);
+            this.ma_salecode_label.Location = new System.Drawing.Point(46, 481);
             this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(115, 32);
+            this.ma_salecode_label.Size = new System.Drawing.Size(137, 39);
             this.ma_salecode_label.TabIndex = 83;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -242,20 +247,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1248, 181);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintLabel.Location = new System.Drawing.Point(1404, 217);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(160, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(180, 26);
             this.PrintLabel.TabIndex = 157;
             // 
             // Printer_label
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1119, 139);
+            this.Printer_label.Location = new System.Drawing.Point(1259, 167);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(107, 25);
+            this.Printer_label.Size = new System.Drawing.Size(123, 30);
             this.Printer_label.TabIndex = 159;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -263,10 +268,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1119, 181);
+            this.label1.Location = new System.Drawing.Point(1259, 217);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(88, 25);
+            this.label1.Size = new System.Drawing.Size(101, 30);
             this.label1.TabIndex = 161;
             this.label1.Text = "打印标签";
             // 
@@ -276,20 +281,20 @@
             this.AutoPrint.Checked = true;
             this.AutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 10.8F);
-            this.AutoPrint.Location = new System.Drawing.Point(1124, 52);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.AutoPrint.Location = new System.Drawing.Point(1264, 62);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(110, 29);
+            this.AutoPrint.Size = new System.Drawing.Size(127, 34);
             this.AutoPrint.TabIndex = 169;
             this.AutoPrint.Text = "自动打印";
             this.AutoPrint.UseVisualStyleBackColor = true;
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1249, 95);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintNum.Location = new System.Drawing.Point(1405, 114);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(160, 25);
+            this.PrintNum.Size = new System.Drawing.Size(180, 28);
             this.PrintNum.TabIndex = 170;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -301,10 +306,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1119, 96);
+            this.label2.Location = new System.Drawing.Point(1259, 115);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(88, 25);
+            this.label2.Size = new System.Drawing.Size(101, 30);
             this.label2.TabIndex = 171;
             this.label2.Text = "打印张数";
             // 
@@ -312,11 +317,11 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(1249, 69);
+            this.ComList.Location = new System.Drawing.Point(1405, 83);
             this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(63, 15);
+            this.ComList.Size = new System.Drawing.Size(71, 18);
             this.ComList.TabIndex = 173;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -325,21 +330,21 @@
             // 
             this.BaudRate.AutoSize = true;
             this.BaudRate.CutLength = null;
-            this.BaudRate.Location = new System.Drawing.Point(1249, 49);
+            this.BaudRate.Location = new System.Drawing.Point(1405, 59);
             this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.BaudRate.MaximumSize = new System.Drawing.Size(200, 0);
+            this.BaudRate.MaximumSize = new System.Drawing.Size(225, 0);
             this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(71, 15);
+            this.BaudRate.Size = new System.Drawing.Size(80, 18);
             this.BaudRate.TabIndex = 172;
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1248, 139);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.PrinterList.Location = new System.Drawing.Point(1404, 167);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(160, 28);
+            this.PrinterList.Size = new System.Drawing.Size(180, 34);
             this.PrinterList.TabIndex = 158;
             // 
             // StartWeight
@@ -349,13 +354,13 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(877, 31);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StartWeight.Location = new System.Drawing.Point(987, 37);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
             this.StartWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.NormalImage")));
             this.StartWeight.Power = null;
-            this.StartWeight.Size = new System.Drawing.Size(100, 30);
+            this.StartWeight.Size = new System.Drawing.Size(112, 36);
             this.StartWeight.TabIndex = 156;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -368,13 +373,13 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(1225, 222);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Location = new System.Drawing.Point(1378, 266);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(100, 29);
+            this.Confirm.Size = new System.Drawing.Size(112, 35);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -384,11 +389,11 @@
             // 
             this.pd_barcode.AutoSize = true;
             this.pd_barcode.CutLength = null;
-            this.pd_barcode.Location = new System.Drawing.Point(1249, 26);
+            this.pd_barcode.Location = new System.Drawing.Point(1405, 31);
             this.pd_barcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pd_barcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pd_barcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pd_barcode.Name = "pd_barcode";
-            this.pd_barcode.Size = new System.Drawing.Size(87, 15);
+            this.pd_barcode.Size = new System.Drawing.Size(98, 18);
             this.pd_barcode.TabIndex = 107;
             this.pd_barcode.Text = "pd_barcode";
             this.pd_barcode.Visible = false;
@@ -400,13 +405,13 @@
             this.StopWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.DownImage")));
             this.StopWeight.Image = ((System.Drawing.Image)(resources.GetObject("StopWeight.Image")));
             this.StopWeight.IsShowBorder = true;
-            this.StopWeight.Location = new System.Drawing.Point(1004, 31);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.StopWeight.Location = new System.Drawing.Point(1130, 37);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.StopWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.MoveImage")));
             this.StopWeight.Name = "StopWeight";
             this.StopWeight.NormalImage = ((System.Drawing.Image)(resources.GetObject("StopWeight.NormalImage")));
             this.StopWeight.Power = null;
-            this.StopWeight.Size = new System.Drawing.Size(100, 30);
+            this.StopWeight.Size = new System.Drawing.Size(112, 36);
             this.StopWeight.TabIndex = 102;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -417,11 +422,11 @@
             this.ma_code.AutoSize = true;
             this.ma_code.CutLength = null;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(188, 302);
+            this.ma_code.Location = new System.Drawing.Point(212, 362);
             this.ma_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_code.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_code.MaximumSize = new System.Drawing.Size(225, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 32);
+            this.ma_code.Size = new System.Drawing.Size(0, 39);
             this.ma_code.TabIndex = 101;
             this.ma_code.Tag = "1";
             // 
@@ -430,11 +435,11 @@
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(188, 606);
+            this.ma_qty.Location = new System.Drawing.Point(212, 727);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(225, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 32);
+            this.ma_qty.Size = new System.Drawing.Size(0, 39);
             this.ma_qty.TabIndex = 100;
             // 
             // pr_detail
@@ -442,11 +447,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(188, 503);
+            this.pr_detail.Location = new System.Drawing.Point(212, 604);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 32);
+            this.pr_detail.Size = new System.Drawing.Size(0, 39);
             this.pr_detail.TabIndex = 99;
             // 
             // ma_salecode
@@ -454,11 +459,11 @@
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.CutLength = null;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_salecode.Location = new System.Drawing.Point(188, 401);
+            this.ma_salecode.Location = new System.Drawing.Point(212, 481);
             this.ma_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_salecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(225, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 32);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 39);
             this.ma_salecode.TabIndex = 98;
             // 
             // Clean
@@ -468,13 +473,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1236, 661);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Location = new System.Drawing.Point(1390, 793);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(100, 30);
+            this.Clean.Size = new System.Drawing.Size(112, 36);
             this.Clean.TabIndex = 89;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -486,8 +491,8 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = ((System.Drawing.Image)(resources.GetObject("normalButton1.Image")));
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(33, 69);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.normalButton1.Location = new System.Drawing.Point(37, 83);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -503,11 +508,11 @@
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(125, 26);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.outboxcode.Location = new System.Drawing.Point(141, 31);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = null;
-            this.outboxcode.Size = new System.Drawing.Size(721, 47);
+            this.outboxcode.Size = new System.Drawing.Size(811, 55);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -517,18 +522,54 @@
             // 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(1124, 267);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(1264, 320);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(297, 376);
+            this.OperateResult.Size = new System.Drawing.Size(334, 450);
             this.OperateResult.TabIndex = 87;
             this.OperateResult.Text = "";
             // 
+            // WeighRecord
+            // 
+            this.WeighRecord.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2,
+            this.columnHeader3,
+            this.columnHeader4});
+            this.WeighRecord.Location = new System.Drawing.Point(633, 320);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4);
+            this.WeighRecord.Name = "WeighRecord";
+            this.WeighRecord.Size = new System.Drawing.Size(580, 450);
+            this.WeighRecord.TabIndex = 174;
+            this.WeighRecord.UseCompatibleStateImageBehavior = false;
+            this.WeighRecord.View = System.Windows.Forms.View.Details;
+            // 
+            // columnHeader1
+            // 
+            this.columnHeader1.Text = "";
+            this.columnHeader1.Width = 23;
+            // 
+            // columnHeader2
+            // 
+            this.columnHeader2.Text = "箱号";
+            this.columnHeader2.Width = 127;
+            // 
+            // columnHeader3
+            // 
+            this.columnHeader3.Text = "重量";
+            this.columnHeader3.Width = 99;
+            // 
+            // columnHeader4
+            // 
+            this.columnHeader4.Text = "时间";
+            this.columnHeader4.Width = 130;
+            // 
             // Make_CartonBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1429, 700);
+            this.ClientSize = new System.Drawing.Size(1608, 840);
+            this.Controls.Add(this.WeighRecord);
             this.Controls.Add(this.ComList);
             this.Controls.Add(this.BaudRate);
             this.Controls.Add(this.label2);
@@ -558,19 +599,19 @@
             this.Controls.Add(this.ma_salecode_label);
             this.Controls.Add(this.OperateResult);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_CartonBoxWeigh";
             this.Tag = "Make!CartonBoxWeigh";
             this.Text = "卡通箱称重";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.卡通箱称重_FormClosing);
             this.Load += new System.EventHandler(this.卡通箱称重_Load);
             this.SizeChanged += new System.EventHandler(this.卡通箱称重_SizeChanged);
-            this.panel6.ResumeLayout(false);
+            this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -612,5 +653,10 @@
         private System.Windows.Forms.Label label2;
         private CustomControl.ValueLabel.ValueLabel BaudRate;
         private CustomControl.ValueLabel.ValueLabel ComList;
+        private System.Windows.Forms.ListView WeighRecord;
+        private System.Windows.Forms.ColumnHeader columnHeader1;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+        private System.Windows.Forms.ColumnHeader columnHeader3;
+        private System.Windows.Forms.ColumnHeader columnHeader4;
     }
 }

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -122,6 +122,11 @@ namespace UAS_MES.Make
                     {
                         OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测未通过\n", Color.Red);
                     }
+                    ListViewItem lsi = new ListViewItem();
+                    lsi.SubItems.Add(outboxcode.Text);
+                    lsi.SubItems.Add(ActualWeight.ToString());
+                    lsi.SubItems.Add(System.DateTime.Now.ToString());
+                    WeighRecord.Items.Add(lsi);
                     dh.ExecuteSql("update package set pa_weight='" + weight.Text + "', pa_printcount= nvl(pa_printcount,0)+1 where pa_outboxcode='" + outboxcode.Text + "'", "update");
                     outboxcode.Clear();
                 }

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -171,11 +171,7 @@ namespace UAS_MES.Make
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {
-                                if (dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0)
-                                {
-
-                                }
-                                else
+                                if (!(dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0))
                                 {
                                     OperateResult.AppendText(">>BT号不符合销售单合同范围\n", Color.Red);
                                     sncode.Text = "";
@@ -245,11 +241,7 @@ namespace UAS_MES.Make
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
-                            if (dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0)
-                            {
-
-                            }
-                            else
+                            if (!(dt.Rows[0]["sr_startcode"].ToString().CompareTo(sncode.Text) <= 0 && dt.Rows[0]["sr_endcode"].ToString().CompareTo(sncode.Text) >= 0))
                             {
                                 OperateResult.AppendText(">>MAC号不符合销售单合同范围\n", Color.Red);
                                 sncode.Text = "";

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -49,6 +49,7 @@ namespace UAS_MES.Make
             {
                 string ErrorMessage2;
                 string oMakeCode;
+                //采集序列号
                 if (!isnetcode)
                 {
                     if (sncode.Text == "")
@@ -95,6 +96,7 @@ namespace UAS_MES.Make
                         OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
                     }
                 }
+                //采集netcode
                 else
                 {
                     if (sncode.Text == "")
@@ -102,6 +104,7 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>网标号不能为空\n", Color.Red);
                         return;
                     }
+                    #region
                     //sql.Clear();
                     //sql.Append("select psr_prefix,psr_length from productsnrelation where psr_prodcode = '" + ma_prodcode.Text + "' and psr_type = 'NETCODE'");
                     //dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -115,6 +118,7 @@ namespace UAS_MES.Make
                     //        return;
                     //    } 
                     //}
+                    #endregion
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
                     string ErrorMessage = "";
                     string result = "";

UAS-MES/FunctionCode/Make/Make_Decompose.Designer.cs

@@ -36,6 +36,20 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.LabelDataGridView = new System.Windows.Forms.DataGridView();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.Choose2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.cm_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.AddBad = new System.Windows.Forms.DataGridViewImageColumn();
+            this.cm_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.New_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.balnk = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_maid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_materialtype = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -53,20 +67,6 @@
             this.ms_wccode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ms_craftname = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ms_craftcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.Choose2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.cm_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.AddBad = new System.Windows.Forms.DataGridViewImageColumn();
-            this.cm_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.New_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.balnk = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm_maid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm_materialtype = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.deccount = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_name = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -164,9 +164,107 @@
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.Size = new System.Drawing.Size(889, 233);
             this.LabelDataGridView.TabIndex = 188;
-            this.LabelDataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellClick);
             this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
             // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "拆解更换";
+            this.Choose.Name = "Choose";
+            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose.Width = 60;
+            // 
+            // Choose2
+            // 
+            this.Choose2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose2.HeaderText = "拆解";
+            this.Choose2.Name = "Choose2";
+            this.Choose2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose2.Width = 40;
+            // 
+            // cm_id
+            // 
+            this.cm_id.DataPropertyName = "cm_id";
+            this.cm_id.HeaderText = "cm_id";
+            this.cm_id.Name = "cm_id";
+            this.cm_id.Visible = false;
+            this.cm_id.Width = 5;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "pr_detail";
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Visible = false;
+            this.pr_detail.Width = 80;
+            // 
+            // mb_bgcode
+            // 
+            this.mb_bgcode.HeaderText = "不良代码组编号";
+            this.mb_bgcode.Name = "mb_bgcode";
+            this.mb_bgcode.Visible = false;
+            this.mb_bgcode.Width = 80;
+            // 
+            // mb_badcode
+            // 
+            this.mb_badcode.HeaderText = "不良代码";
+            this.mb_badcode.Name = "mb_badcode";
+            this.mb_badcode.Width = 80;
+            // 
+            // AddBad
+            // 
+            this.AddBad.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.AddBad.HeaderText = "";
+            this.AddBad.Image = global::UAS_MES.Properties.Resources.plus;
+            this.AddBad.Name = "AddBad";
+            this.AddBad.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.AddBad.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.AddBad.Width = 20;
+            // 
+            // cm_soncode
+            // 
+            this.cm_soncode.DataPropertyName = "cm_soncode";
+            this.cm_soncode.HeaderText = "子件编号";
+            this.cm_soncode.Name = "cm_soncode";
+            // 
+            // cm_barcode
+            // 
+            this.cm_barcode.DataPropertyName = "cm_barcode";
+            this.cm_barcode.HeaderText = "物料批号";
+            this.cm_barcode.Name = "cm_barcode";
+            // 
+            // New_BarCode
+            // 
+            this.New_BarCode.HeaderText = "新批号";
+            this.New_BarCode.Name = "New_BarCode";
+            // 
+            // balnk
+            // 
+            this.balnk.HeaderText = "";
+            this.balnk.Name = "balnk";
+            this.balnk.Width = 5;
+            // 
+            // cm_maid
+            // 
+            this.cm_maid.DataPropertyName = "cm_maid";
+            this.cm_maid.HeaderText = "";
+            this.cm_maid.Name = "cm_maid";
+            this.cm_maid.Visible = false;
+            // 
+            // cm_materialtype
+            // 
+            this.cm_materialtype.DataPropertyName = "cm_materialtype";
+            this.cm_materialtype.HeaderText = "";
+            this.cm_materialtype.Name = "cm_materialtype";
+            this.cm_materialtype.Visible = false;
+            // 
+            // cm_sncode
+            // 
+            this.cm_sncode.DataPropertyName = "cm_sncode";
+            this.cm_sncode.HeaderText = "";
+            this.cm_sncode.Name = "cm_sncode";
+            this.cm_sncode.Visible = false;
+            // 
             // dataGridViewCheckBoxColumn1
             // 
             this.dataGridViewCheckBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -299,105 +397,6 @@
             this.ms_craftcode.TabIndex = 189;
             this.ms_craftcode.Visible = false;
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "拆解更换";
-            this.Choose.Name = "Choose";
-            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose.Width = 60;
-            // 
-            // Choose2
-            // 
-            this.Choose2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose2.HeaderText = "拆解";
-            this.Choose2.Name = "Choose2";
-            this.Choose2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose2.Width = 40;
-            // 
-            // cm_id
-            // 
-            this.cm_id.DataPropertyName = "cm_id";
-            this.cm_id.HeaderText = "cm_id";
-            this.cm_id.Name = "cm_id";
-            this.cm_id.Visible = false;
-            this.cm_id.Width = 5;
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.DataPropertyName = "pr_detail";
-            this.pr_detail.HeaderText = "pr_detail";
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Visible = false;
-            this.pr_detail.Width = 80;
-            // 
-            // mb_bgcode
-            // 
-            this.mb_bgcode.HeaderText = "不良代码组编号";
-            this.mb_bgcode.Name = "mb_bgcode";
-            this.mb_bgcode.Visible = false;
-            this.mb_bgcode.Width = 80;
-            // 
-            // mb_badcode
-            // 
-            this.mb_badcode.HeaderText = "不良代码";
-            this.mb_badcode.Name = "mb_badcode";
-            this.mb_badcode.Width = 80;
-            // 
-            // AddBad
-            // 
-            this.AddBad.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.AddBad.HeaderText = "";
-            this.AddBad.Image = global::UAS_MES.Properties.Resources.plus;
-            this.AddBad.Name = "AddBad";
-            this.AddBad.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.AddBad.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.AddBad.Width = 20;
-            // 
-            // cm_soncode
-            // 
-            this.cm_soncode.DataPropertyName = "cm_soncode";
-            this.cm_soncode.HeaderText = "子件编号";
-            this.cm_soncode.Name = "cm_soncode";
-            // 
-            // cm_barcode
-            // 
-            this.cm_barcode.DataPropertyName = "cm_barcode";
-            this.cm_barcode.HeaderText = "物料批号";
-            this.cm_barcode.Name = "cm_barcode";
-            // 
-            // New_BarCode
-            // 
-            this.New_BarCode.HeaderText = "新批号";
-            this.New_BarCode.Name = "New_BarCode";
-            // 
-            // balnk
-            // 
-            this.balnk.HeaderText = "";
-            this.balnk.Name = "balnk";
-            this.balnk.Width = 5;
-            // 
-            // cm_maid
-            // 
-            this.cm_maid.DataPropertyName = "cm_maid";
-            this.cm_maid.HeaderText = "";
-            this.cm_maid.Name = "cm_maid";
-            this.cm_maid.Visible = false;
-            // 
-            // cm_materialtype
-            // 
-            this.cm_materialtype.DataPropertyName = "cm_materialtype";
-            this.cm_materialtype.HeaderText = "";
-            this.cm_materialtype.Name = "cm_materialtype";
-            this.cm_materialtype.Visible = false;
-            // 
-            // cm_sncode
-            // 
-            this.cm_sncode.DataPropertyName = "cm_sncode";
-            this.cm_sncode.HeaderText = "";
-            this.cm_sncode.Name = "cm_sncode";
-            this.cm_sncode.Visible = false;
-            // 
             // deccount
             // 
             this.deccount.AutoSize = true;

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -97,7 +97,7 @@ namespace UAS_MES.Make
             }
         }
 
-
+        //加载此序列号上料记录
         private void LoadData(string sncode,object sender,KeyEventArgs e)
         {
             sncode_1 = sncode;
@@ -122,15 +122,10 @@ namespace UAS_MES.Make
         }
 
         private void LabelDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-          
-        }
-
-        private void LabelDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             if (e.ColumnIndex >= 0 && e.RowIndex >= 0)
             {
-                if (LabelDataGridView.Columns[e.ColumnIndex].HeaderText == "拆解更料")
+                if (LabelDataGridView.Columns[e.ColumnIndex].HeaderText == "拆解更换")
                 {
                     if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose2"].Value != null)
                     {
@@ -175,6 +170,11 @@ namespace UAS_MES.Make
             }
         }
 
+        private void LabelDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
+        {
+            
+        }
+
         private void LoadBadcode(object sender, EventArgs e)
         {
             sql.Clear();

UAS-MES/FunctionCode/Make/Make_Decompose.resx

@@ -156,45 +156,6 @@
   <metadata name="cm_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Choose2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cm_id.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="mb_bgcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="mb_badcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="AddBad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cm_soncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cm_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="New_BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="balnk.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cm_maid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cm_materialtype.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cm_sncode.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="Decompose.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>