Merge branch 'master' of ssh://10.10.101.21/source/mes-client

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

@@ -87,11 +87,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.pr_detail_label);
             this.groupBoxWithBorder1.Controls.Add(this.ma_qty_label);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(9, 10);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 12);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(818, 146);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1091, 182);
             this.groupBoxWithBorder1.TabIndex = 0;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "工单信息";
@@ -101,11 +101,10 @@
             // 
             this.ma_id.AutoSize = true;
             this.ma_id.CutLength = null;
-            this.ma_id.Location = new System.Drawing.Point(595, 114);
-            this.ma_id.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_id.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_id.Location = new System.Drawing.Point(792, 141);
+            this.ma_id.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_id.Name = "ma_id";
-            this.ma_id.Size = new System.Drawing.Size(0, 21);
+            this.ma_id.Size = new System.Drawing.Size(0, 27);
             this.ma_id.TabIndex = 16;
             this.ma_id.Visible = false;
             // 
@@ -113,22 +112,21 @@
             // 
             this.ma_craftcode.AutoSize = true;
             this.ma_craftcode.CutLength = null;
-            this.ma_craftcode.Location = new System.Drawing.Point(540, 114);
-            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_craftcode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_craftcode.Location = new System.Drawing.Point(719, 141);
+            this.ma_craftcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_craftcode.Name = "ma_craftcode";
-            this.ma_craftcode.Size = new System.Drawing.Size(0, 21);
+            this.ma_craftcode.Size = new System.Drawing.Size(0, 27);
             this.ma_craftcode.TabIndex = 15;
             this.ma_craftcode.Visible = false;
             // 
             // ma_saveimei
             // 
             this.ma_saveimei.AutoSize = true;
-            this.ma_saveimei.Location = new System.Drawing.Point(314, 111);
-            this.ma_saveimei.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_saveimei.Location = new System.Drawing.Point(417, 138);
+            this.ma_saveimei.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ma_saveimei.Name = "ma_saveimei";
             this.ma_saveimei.Power = null;
-            this.ma_saveimei.Size = new System.Drawing.Size(199, 25);
+            this.ma_saveimei.Size = new System.Drawing.Size(246, 31);
             this.ma_saveimei.TabIndex = 14;
             this.ma_saveimei.Text = "保留原有IMEI/网标信息";
             this.ma_saveimei.UseVisualStyleBackColor = true;
@@ -136,11 +134,11 @@
             // ma_savemacbt
             // 
             this.ma_savemacbt.AutoSize = true;
-            this.ma_savemacbt.Location = new System.Drawing.Point(32, 111);
-            this.ma_savemacbt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_savemacbt.Location = new System.Drawing.Point(41, 138);
+            this.ma_savemacbt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ma_savemacbt.Name = "ma_savemacbt";
             this.ma_savemacbt.Power = null;
-            this.ma_savemacbt.Size = new System.Drawing.Size(189, 25);
+            this.ma_savemacbt.Size = new System.Drawing.Size(234, 31);
             this.ma_savemacbt.TabIndex = 13;
             this.ma_savemacbt.Text = "保留原有MAC/BT信息";
             this.ma_savemacbt.UseVisualStyleBackColor = true;
@@ -150,10 +148,10 @@
             this.LockCheckBox.AutoSize = true;
             this.LockCheckBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockCheckBox.LeaveEvent = false;
-            this.LockCheckBox.Location = new System.Drawing.Point(242, 37);
-            this.LockCheckBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.LockCheckBox.Location = new System.Drawing.Point(321, 45);
+            this.LockCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LockCheckBox.Name = "LockCheckBox";
-            this.LockCheckBox.Size = new System.Drawing.Size(51, 21);
+            this.LockCheckBox.Size = new System.Drawing.Size(61, 24);
             this.LockCheckBox.TabIndex = 12;
             this.LockCheckBox.Text = "锁定";
             this.LockCheckBox.UseVisualStyleBackColor = true;
@@ -161,10 +159,9 @@
             // ma_code_label
             // 
             this.ma_code_label.AutoSize = true;
-            this.ma_code_label.Location = new System.Drawing.Point(28, 34);
-            this.ma_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_code_label.Location = new System.Drawing.Point(36, 41);
             this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_code_label.Size = new System.Drawing.Size(92, 27);
             this.ma_code_label.TabIndex = 11;
             this.ma_code_label.Text = "返工单号";
             // 
@@ -176,14 +173,14 @@
             this.ma_code.DBTitle = null;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(115, 34);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_code.Location = new System.Drawing.Point(153, 42);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(117, 22);
+            this.ma_code.Size = new System.Drawing.Size(156, 28);
             this.ma_code.TabIndex = 10;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = true;
@@ -193,33 +190,30 @@
             // 
             this.pr_spec.AutoSize = true;
             this.pr_spec.CutLength = null;
-            this.pr_spec.Location = new System.Drawing.Point(620, 77);
-            this.pr_spec.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.pr_spec.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_spec.Location = new System.Drawing.Point(825, 95);
+            this.pr_spec.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(0, 21);
+            this.pr_spec.Size = new System.Drawing.Size(0, 27);
             this.pr_spec.TabIndex = 9;
             // 
             // getsnqty
             // 
             this.getsnqty.AutoSize = true;
             this.getsnqty.CutLength = null;
-            this.getsnqty.Location = new System.Drawing.Point(620, 32);
-            this.getsnqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.getsnqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.getsnqty.Location = new System.Drawing.Point(825, 39);
+            this.getsnqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.getsnqty.Name = "getsnqty";
-            this.getsnqty.Size = new System.Drawing.Size(0, 21);
+            this.getsnqty.Size = new System.Drawing.Size(0, 27);
             this.getsnqty.TabIndex = 8;
             // 
             // pr_code
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
-            this.pr_code.Location = new System.Drawing.Point(111, 77);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_code.Location = new System.Drawing.Point(147, 95);
+            this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 21);
+            this.pr_code.Size = new System.Drawing.Size(0, 27);
             this.pr_code.TabIndex = 7;
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -227,71 +221,64 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.CutLength = null;
-            this.ma_qty.Location = new System.Drawing.Point(392, 32);
-            this.ma_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ma_qty.Location = new System.Drawing.Point(521, 39);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(200, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 21);
+            this.ma_qty.Size = new System.Drawing.Size(0, 27);
             this.ma_qty.TabIndex = 6;
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
-            this.pr_detail.Location = new System.Drawing.Point(392, 77);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_detail.Location = new System.Drawing.Point(521, 95);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 21);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 5;
             // 
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
-            this.pr_code_label.Location = new System.Drawing.Point(28, 77);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(36, 95);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
             this.pr_code_label.TabIndex = 4;
             this.pr_code_label.Text = "产品编号";
             // 
             // pr_spec_label
             // 
             this.pr_spec_label.AutoSize = true;
-            this.pr_spec_label.Location = new System.Drawing.Point(540, 77);
-            this.pr_spec_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_spec_label.Location = new System.Drawing.Point(719, 95);
             this.pr_spec_label.Name = "pr_spec_label";
-            this.pr_spec_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_spec_label.Size = new System.Drawing.Size(92, 27);
             this.pr_spec_label.TabIndex = 3;
             this.pr_spec_label.Text = "产品规格";
             // 
             // getsnqty_label
             // 
             this.getsnqty_label.AutoSize = true;
-            this.getsnqty_label.Location = new System.Drawing.Point(540, 32);
-            this.getsnqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.getsnqty_label.Location = new System.Drawing.Point(719, 39);
             this.getsnqty_label.Name = "getsnqty_label";
-            this.getsnqty_label.Size = new System.Drawing.Size(74, 21);
+            this.getsnqty_label.Size = new System.Drawing.Size(92, 27);
             this.getsnqty_label.TabIndex = 2;
             this.getsnqty_label.Text = "已维护数";
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
-            this.pr_detail_label.Location = new System.Drawing.Point(310, 77);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(412, 95);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
             this.pr_detail_label.TabIndex = 1;
             this.pr_detail_label.Text = "产品名称";
             // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
-            this.ma_qty_label.Location = new System.Drawing.Point(310, 32);
-            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_qty_label.Location = new System.Drawing.Point(412, 39);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(74, 21);
+            this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
             this.ma_qty_label.TabIndex = 0;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -306,11 +293,11 @@
             this.groupBoxWithBorder2.Controls.Add(this.PrinterList_label);
             this.groupBoxWithBorder2.Controls.Add(this.PrinterList);
             this.groupBoxWithBorder2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder2.Location = new System.Drawing.Point(9, 161);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(12, 201);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(402, 142);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(536, 178);
             this.groupBoxWithBorder2.TabIndex = 13;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "打印设置";
@@ -319,20 +306,19 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(226, 111);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.Location = new System.Drawing.Point(300, 138);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 18;
             this.label2.Text = "打印份数";
             // 
             // PrintNum
             // 
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintNum.Location = new System.Drawing.Point(302, 111);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.PrintNum.Location = new System.Drawing.Point(403, 139);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(90, 23);
+            this.PrintNum.Size = new System.Drawing.Size(120, 27);
             this.PrintNum.TabIndex = 17;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -345,58 +331,56 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(106, 74);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(141, 92);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(190, 25);
+            this.PrintLabel.Size = new System.Drawing.Size(252, 28);
             this.PrintLabel.TabIndex = 16;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
             // PrintLabel_label
             // 
             this.PrintLabel_label.AutoSize = true;
-            this.PrintLabel_label.Location = new System.Drawing.Point(14, 77);
-            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PrintLabel_label.Location = new System.Drawing.Point(17, 95);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(74, 21);
+            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
             this.PrintLabel_label.TabIndex = 15;
             this.PrintLabel_label.Text = "产品名称";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(106, 111);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.AutoPrint.Location = new System.Drawing.Point(141, 139);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(93, 25);
+            this.AutoPrint.Size = new System.Drawing.Size(124, 31);
             this.AutoPrint.TabIndex = 14;
             // 
             // PrinterList_label
             // 
             this.PrinterList_label.AutoSize = true;
-            this.PrinterList_label.Location = new System.Drawing.Point(14, 32);
-            this.PrinterList_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PrinterList_label.Location = new System.Drawing.Point(17, 39);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(90, 21);
+            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
             this.PrinterList_label.TabIndex = 13;
             this.PrinterList_label.Text = "打印机列表";
             // 
             // PrinterList
             // 
             this.PrinterList.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrinterList.Location = new System.Drawing.Point(106, 31);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.PrinterList.Location = new System.Drawing.Point(141, 39);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5, 8, 5, 8);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(189, 22);
+            this.PrinterList.Size = new System.Drawing.Size(252, 28);
             this.PrinterList.TabIndex = 0;
             // 
             // 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(9, 307);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.OperateResult.Location = new System.Drawing.Point(12, 384);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(819, 171);
+            this.OperateResult.Size = new System.Drawing.Size(1091, 213);
             this.OperateResult.TabIndex = 14;
             this.OperateResult.Text = "";
             // 
@@ -408,11 +392,11 @@
             this.groupBoxWithBorder3.Controls.Add(this.label1);
             this.groupBoxWithBorder3.Controls.Add(this.sn_code);
             this.groupBoxWithBorder3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder3.Location = new System.Drawing.Point(9, 482);
-            this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder3.Location = new System.Drawing.Point(12, 602);
+            this.groupBoxWithBorder3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBoxWithBorder3.Name = "groupBoxWithBorder3";
-            this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBoxWithBorder3.Size = new System.Drawing.Size(818, 62);
+            this.groupBoxWithBorder3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder3.Size = new System.Drawing.Size(1091, 78);
             this.groupBoxWithBorder3.TabIndex = 14;
             this.groupBoxWithBorder3.TabStop = false;
             this.groupBoxWithBorder3.Text = "输入信息";
@@ -421,22 +405,23 @@
             // ReWorkAsRelateTSN
             // 
             this.ReWorkAsRelateTSN.AutoSize = true;
-            this.ReWorkAsRelateTSN.Location = new System.Drawing.Point(490, 26);
-            this.ReWorkAsRelateTSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ReWorkAsRelateTSN.Location = new System.Drawing.Point(652, 31);
+            this.ReWorkAsRelateTSN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ReWorkAsRelateTSN.Name = "ReWorkAsRelateTSN";
-            this.ReWorkAsRelateTSN.Size = new System.Drawing.Size(177, 25);
+            this.ReWorkAsRelateTSN.Size = new System.Drawing.Size(220, 31);
             this.ReWorkAsRelateTSN.TabIndex = 15;
             this.ReWorkAsRelateTSN.Text = "以SN关联的TSN返工";
             this.ReWorkAsRelateTSN.UseVisualStyleBackColor = true;
+            this.ReWorkAsRelateTSN.Visible = false;
             // 
             // ReWorkAsCurrentSN
             // 
             this.ReWorkAsCurrentSN.AutoSize = true;
             this.ReWorkAsCurrentSN.Checked = true;
-            this.ReWorkAsCurrentSN.Location = new System.Drawing.Point(349, 26);
-            this.ReWorkAsCurrentSN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ReWorkAsCurrentSN.Location = new System.Drawing.Point(464, 31);
+            this.ReWorkAsCurrentSN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ReWorkAsCurrentSN.Name = "ReWorkAsCurrentSN";
-            this.ReWorkAsCurrentSN.Size = new System.Drawing.Size(124, 25);
+            this.ReWorkAsCurrentSN.Size = new System.Drawing.Size(153, 31);
             this.ReWorkAsCurrentSN.TabIndex = 14;
             this.ReWorkAsCurrentSN.TabStop = true;
             this.ReWorkAsCurrentSN.Text = "以当前号返工";
@@ -445,10 +430,9 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(42, 27);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Location = new System.Drawing.Point(55, 32);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.Size = new System.Drawing.Size(72, 27);
             this.label1.TabIndex = 13;
             this.label1.Text = "输入框";
             // 
@@ -458,11 +442,11 @@
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(115, 26);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.sn_code.Location = new System.Drawing.Point(153, 32);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(148, 23);
+            this.sn_code.Size = new System.Drawing.Size(196, 27);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -471,15 +455,15 @@
             // 
             // Make_GetReMakeSN
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(836, 554);
+            this.ClientSize = new System.Drawing.Size(1115, 692);
             this.Controls.Add(this.groupBoxWithBorder3);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.groupBoxWithBorder1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_GetReMakeSN";
             this.Tag = "Make!GetReMakeSN";
             this.Text = "返工数据采集";

UAS-MES/PublicMethod/LogicHandler.cs

@@ -876,7 +876,7 @@ namespace UAS_MES.PublicMethod
             sql.Clear();
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
             sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status,mb_badremark,mb_bgname,mb_badname)");
-            sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + StepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
+            sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + StepCode + "','" + iSourceCode + "',:bc_code,:bg_code,'',");
             sql.Append("sp_soncode,'0',:bc_remark,:bg_name,:bc_name from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
             dh.BatchInsert(sql.ToString(), new string[] { "bc_code", "bg_code", "bc_remark", "bg_name", "bc_name" }, iBadCode, iBadGroupCode, iBadRemark, iBadGroupName, iBadName);

UAS_AutoUpdate/CheckUpdateWindow.cs

@@ -23,7 +23,7 @@ namespace UAS_AutoUpdate
             //使用WebClient从指定位置下载文件，然后进行解压缩覆盖
             WebClient wc = new WebClient();
             wc.DownloadProgressChanged += Wc_DownloadProgressChanged;
-            wc.DownloadFileAsync(new Uri("http://218.17.158.219:8888/UAS_MES.zip"), "UAS_MES.zip");
+            wc.DownloadFileAsync(new Uri("http://172.16.11.99/UAS_MES.zip"), "UAS_MES.zip");
         }
 
         private void Wc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
@@ -85,21 +85,28 @@ namespace UAS_AutoUpdate
                     }
                     if (!string.IsNullOrEmpty(fileName))
                     {
-                        using (FileStream streamWriter = File.Create(fileName))
+                        try
                         {
-                            int size = 4096;
-                            byte[] data = new byte[size];
-                            while (size > 0)
+                            //防止文件正在使用中报错
+                            using (FileStream streamWriter = File.Create(fileName))
                             {
-                                size = s.Read(data, 0, data.Length);
-                                streamWriter.Write(data, 0, size);
+                                int size = 4096;
+                                byte[] data = new byte[size];
+                                while (size > 0)
+                                {
+                                    size = s.Read(data, 0, data.Length);
+                                    streamWriter.Write(data, 0, size);
+                                }
                             }
                         }
+                        catch (Exception)
+                        {
+                        }
                     }
                 }
+                File.Delete(Application.StartupPath + @"\UAS_MES.zip");
+                CheckUpdateWindow.Zipped = true;
             }
-            File.Delete(Application.StartupPath + @"\UAS_MES.zip");
-            CheckUpdateWindow.Zipped = true;
         }
     }
 }