万利达MES修改提交

UAS-MES/App.config

@@ -44,7 +44,7 @@
   <applicationSettings>
     <UAS_MES.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES.Properties.Settings>
   </applicationSettings>

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

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_ColorBoxWeigh));
             this.pr_colorboxgw_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
@@ -40,7 +41,7 @@
             this.ma_qty_label = new System.Windows.Forms.Label();
             this.ma_salecode_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.PrintLabel = new UAS_MES.CustomControl.ComBoxWithFocus.ComboxWithTip();
+            this.PrintLabel = new UAS_MES.CustomControl.ComBoxWithFocus.ComboxWithTip(this.components);
             this.Printer_label = new System.Windows.Forms.Label();
             this.PrintLabel_label = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
@@ -78,7 +79,7 @@
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_qty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pr_machinetype = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ma_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -93,10 +94,9 @@
             // 
             this.pr_colorboxgw_label.AutoSize = true;
             this.pr_colorboxgw_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw_label.Location = new System.Drawing.Point(21, 271);
-            this.pr_colorboxgw_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_colorboxgw_label.Location = new System.Drawing.Point(16, 217);
             this.pr_colorboxgw_label.Name = "pr_colorboxgw_label";
-            this.pr_colorboxgw_label.Size = new System.Drawing.Size(115, 32);
+            this.pr_colorboxgw_label.Size = new System.Drawing.Size(92, 27);
             this.pr_colorboxgw_label.TabIndex = 42;
             this.pr_colorboxgw_label.Text = "标准重量";
             // 
@@ -104,10 +104,9 @@
             // 
             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(21, 384);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(16, 307);
             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(92, 27);
             this.pr_code_label.TabIndex = 40;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -117,10 +116,9 @@
             this.pr_colorboxunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_colorboxunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_colorboxunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_colorboxunit.Location = new System.Drawing.Point(21, 122);
-            this.pr_colorboxunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_colorboxunit.Location = new System.Drawing.Point(16, 98);
             this.pr_colorboxunit.Name = "pr_colorboxunit";
-            this.pr_colorboxunit.Size = new System.Drawing.Size(38, 31);
+            this.pr_colorboxunit.Size = new System.Drawing.Size(31, 25);
             this.pr_colorboxunit.TabIndex = 42;
             this.pr_colorboxunit.Text = "克";
             this.pr_colorboxunit.Visible = false;
@@ -131,10 +129,9 @@
             this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.weight_label.Location = new System.Drawing.Point(21, 65);
-            this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight_label.Location = new System.Drawing.Point(16, 52);
             this.weight_label.Name = "weight_label";
-            this.weight_label.Size = new System.Drawing.Size(62, 31);
+            this.weight_label.Size = new System.Drawing.Size(50, 25);
             this.weight_label.TabIndex = 20;
             this.weight_label.Text = "重量";
             // 
@@ -143,10 +140,9 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.Green;
-            this.weight.Location = new System.Drawing.Point(115, 38);
-            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight.Location = new System.Drawing.Point(86, 30);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 78);
+            this.weight.Size = new System.Drawing.Size(0, 60);
             this.weight.TabIndex = 41;
             // 
             // panel4
@@ -155,20 +151,19 @@
             this.panel4.Controls.Add(this.pr_colorboxunit);
             this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(21, 98);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.panel4.Location = new System.Drawing.Point(16, 78);
+            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(461, 154);
+            this.panel4.Size = new System.Drawing.Size(346, 124);
             this.panel4.TabIndex = 63;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 20F);
-            this.label15.Location = new System.Drawing.Point(11, 22);
-            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Location = new System.Drawing.Point(8, 18);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(122, 45);
+            this.label15.Size = new System.Drawing.Size(96, 35);
             this.label15.TabIndex = 56;
             this.label15.Text = "条码号";
             // 
@@ -176,10 +171,9 @@
             // 
             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(21, 502);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(16, 402);
             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(92, 27);
             this.pr_detail_label.TabIndex = 53;
             this.pr_detail_label.Text = "产品型号";
             // 
@@ -187,10 +181,9 @@
             // 
             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(21, 559);
-            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_qty_label.Location = new System.Drawing.Point(16, 447);
             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(92, 27);
             this.ma_qty_label.TabIndex = 55;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -198,10 +191,9 @@
             // 
             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(21, 444);
-            this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_salecode_label.Location = new System.Drawing.Point(16, 355);
             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(92, 27);
             this.ma_salecode_label.TabIndex = 54;
             this.ma_salecode_label.Text = "订单编号";
             // 
@@ -209,10 +201,9 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(21, 326);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(16, 261);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(115, 32);
+            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.ms_makecode_label.TabIndex = 72;
             this.ms_makecode_label.Text = "制造单号";
             // 
@@ -220,10 +211,10 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1171, 148);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(878, 118);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(159, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(120, 20);
             this.PrintLabel.TabIndex = 159;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -231,10 +222,9 @@
             // 
             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(1027, 108);
-            this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Printer_label.Location = new System.Drawing.Point(770, 86);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(107, 25);
+            this.Printer_label.Size = new System.Drawing.Size(84, 20);
             this.Printer_label.TabIndex = 162;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -242,10 +232,9 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(1027, 148);
-            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrintLabel_label.Location = new System.Drawing.Point(770, 118);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(88, 25);
+            this.PrintLabel_label.Size = new System.Drawing.Size(69, 20);
             this.PrintLabel_label.TabIndex = 163;
             this.PrintLabel_label.Text = "打印标签";
             // 
@@ -253,10 +242,9 @@
             // 
             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(1027, 72);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(770, 58);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(88, 25);
+            this.label1.Size = new System.Drawing.Size(69, 20);
             this.label1.TabIndex = 170;
             this.label1.Text = "打印张数";
             // 
@@ -264,10 +252,9 @@
             // 
             this.BaudRate.AutoSize = true;
             this.BaudRate.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BaudRate.Location = new System.Drawing.Point(1179, 40);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BaudRate.Location = new System.Drawing.Point(884, 32);
             this.BaudRate.Name = "BaudRate";
-            this.BaudRate.Size = new System.Drawing.Size(100, 25);
+            this.BaudRate.Size = new System.Drawing.Size(78, 20);
             this.BaudRate.TabIndex = 171;
             this.BaudRate.Text = "BaudRate";
             this.BaudRate.Visible = false;
@@ -276,10 +263,9 @@
             // 
             this.ComList.AutoSize = true;
             this.ComList.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ComList.Location = new System.Drawing.Point(1179, 8);
-            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ComList.Location = new System.Drawing.Point(884, 6);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(86, 25);
+            this.ComList.Size = new System.Drawing.Size(68, 20);
             this.ComList.TabIndex = 172;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -292,10 +278,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.WeighRecord.Location = new System.Drawing.Point(503, 272);
-            this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.WeighRecord.Location = new System.Drawing.Point(377, 218);
+            this.WeighRecord.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.WeighRecord.Name = "WeighRecord";
-            this.WeighRecord.Size = new System.Drawing.Size(507, 416);
+            this.WeighRecord.Size = new System.Drawing.Size(381, 334);
             this.WeighRecord.TabIndex = 173;
             this.WeighRecord.UseCompatibleStateImageBehavior = false;
             this.WeighRecord.View = System.Windows.Forms.View.Details;
@@ -323,10 +309,9 @@
             // pr_sendchecktype
             // 
             this.pr_sendchecktype.AutoSize = true;
-            this.pr_sendchecktype.Location = new System.Drawing.Point(675, 702);
-            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_sendchecktype.Location = new System.Drawing.Point(506, 562);
             this.pr_sendchecktype.Name = "pr_sendchecktype";
-            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 15);
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 12);
             this.pr_sendchecktype.TabIndex = 188;
             this.pr_sendchecktype.Visible = false;
             // 
@@ -334,10 +319,9 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(21, 616);
-            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(16, 493);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(115, 32);
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_inqty_label.TabIndex = 190;
             this.mcd_inqty_label.Text = "已采集数";
             // 
@@ -345,10 +329,9 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(21, 670);
-            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(16, 536);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(115, 32);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(92, 27);
             this.mcd_remainqty_label.TabIndex = 192;
             this.mcd_remainqty_label.Text = "待采集数";
             // 
@@ -358,10 +341,9 @@
             this.CollectRemark.Checked = true;
             this.CollectRemark.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.CollectRemark.Location = new System.Drawing.Point(1029, 218);
-            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Location = new System.Drawing.Point(772, 174);
             this.CollectRemark.Name = "CollectRemark";
-            this.CollectRemark.Size = new System.Drawing.Size(100, 27);
+            this.CollectRemark.Size = new System.Drawing.Size(84, 24);
             this.CollectRemark.TabIndex = 195;
             this.CollectRemark.Text = "采集备注";
             this.CollectRemark.UseVisualStyleBackColor = true;
@@ -369,10 +351,10 @@
             // Remark
             // 
             this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(1024, 252);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Remark.Location = new System.Drawing.Point(768, 202);
+            this.Remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(319, 99);
+            this.Remark.Size = new System.Drawing.Size(240, 80);
             this.Remark.TabIndex = 194;
             this.Remark.Text = "";
             // 
@@ -381,11 +363,10 @@
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.CutLength = null;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(172, 670);
-            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.mcd_remainqty.Location = new System.Drawing.Point(129, 536);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 32);
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_remainqty.TabIndex = 193;
             // 
             // mcd_inqty
@@ -393,20 +374,19 @@
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.CutLength = null;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(172, 616);
-            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_inqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.mcd_inqty.Location = new System.Drawing.Point(129, 493);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 32);
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.TabIndex = 191;
             // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(1031, 182);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.StepCount.Location = new System.Drawing.Point(773, 146);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(107, 28);
+            this.StepCount.Size = new System.Drawing.Size(80, 22);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 189;
@@ -418,13 +398,13 @@
             this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
             this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
             this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(411, 276);
-            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.RefreshWeigh.Location = new System.Drawing.Point(308, 221);
+            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
             this.RefreshWeigh.Name = "RefreshWeigh";
             this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
             this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(72, 30);
+            this.RefreshWeigh.Size = new System.Drawing.Size(54, 24);
             this.RefreshWeigh.TabIndex = 177;
             this.RefreshWeigh.Text = "刷新重量";
             this.RefreshWeigh.UseVisualStyleBackColor = true;
@@ -436,11 +416,11 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1171, 72);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.PrintNum.Location = new System.Drawing.Point(878, 58);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(103, 25);
+            this.PrintNum.Size = new System.Drawing.Size(78, 21);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -457,11 +437,11 @@
             this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty_label);
             this.groupBoxWithBorder2.Controls.Add(this.SendCheck);
             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(503, 98);
-            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder2.Location = new System.Drawing.Point(377, 78);
+            this.groupBoxWithBorder2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBoxWithBorder2.Name = "groupBoxWithBorder2";
-            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBoxWithBorder2.Size = new System.Drawing.Size(507, 152);
+            this.groupBoxWithBorder2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder2.Size = new System.Drawing.Size(380, 122);
             this.groupBoxWithBorder2.TabIndex = 175;
             this.groupBoxWithBorder2.TabStop = false;
             this.groupBoxWithBorder2.Text = "送检信息";
@@ -471,10 +451,9 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_checkno_label.Location = new System.Drawing.Point(28, 93);
-            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno_label.Location = new System.Drawing.Point(21, 74);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(101, 30);
+            this.ob_checkno_label.Size = new System.Drawing.Size(82, 24);
             this.ob_checkno_label.TabIndex = 180;
             this.ob_checkno_label.Text = "当前批号";
             // 
@@ -482,10 +461,9 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_checkno.Location = new System.Drawing.Point(153, 93);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno.Location = new System.Drawing.Point(115, 74);
             this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 30);
+            this.ob_checkno.Size = new System.Drawing.Size(0, 24);
             this.ob_checkno.TabIndex = 179;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
             // 
@@ -493,30 +471,27 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(387, 36);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(290, 28);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 30);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 24);
             this.ob_nowcheckqty.TabIndex = 178;
             // 
             // ob_batchqty
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_batchqty.Location = new System.Drawing.Point(153, 36);
-            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty.Location = new System.Drawing.Point(115, 28);
             this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 30);
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 24);
             this.ob_batchqty.TabIndex = 177;
             // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(261, 36);
-            this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(196, 28);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
-            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(101, 30);
+            this.ob_nowcheckqty_label.Size = new System.Drawing.Size(82, 24);
             this.ob_nowcheckqty_label.TabIndex = 176;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
@@ -524,10 +499,9 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 13F);
-            this.ob_batchqty_label.Location = new System.Drawing.Point(28, 36);
-            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(21, 28);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(101, 30);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(82, 24);
             this.ob_batchqty_label.TabIndex = 175;
             this.ob_batchqty_label.Text = "标准批数";
             // 
@@ -540,13 +514,13 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(387, 108);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.SendCheck.Location = new System.Drawing.Point(290, 86);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
             this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
             this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(60, 30);
+            this.SendCheck.Size = new System.Drawing.Size(45, 24);
             this.SendCheck.TabIndex = 174;
             this.SendCheck.Tag = "ifread";
             this.SendCheck.Text = "送检";
@@ -558,21 +532,20 @@
             this.pr_colorboxgw.AutoSize = true;
             this.pr_colorboxgw.CutLength = null;
             this.pr_colorboxgw.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_colorboxgw.Location = new System.Drawing.Point(172, 271);
-            this.pr_colorboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_colorboxgw.Location = new System.Drawing.Point(129, 217);
+            this.pr_colorboxgw.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_colorboxgw.Name = "pr_colorboxgw";
-            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 32);
+            this.pr_colorboxgw.Size = new System.Drawing.Size(0, 27);
             this.pr_colorboxgw.TabIndex = 80;
             this.pr_colorboxgw.Tag = "1";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1032, 28);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.AutoPrint.Location = new System.Drawing.Point(774, 22);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(140, 28);
+            this.AutoPrint.Size = new System.Drawing.Size(105, 22);
             this.AutoPrint.TabIndex = 174;
             // 
             // pr_code
@@ -580,21 +553,20 @@
             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(171, 384);
-            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.Location = new System.Drawing.Point(128, 307);
+            this.pr_code.MaximumSize = new System.Drawing.Size(150, 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, 27);
             this.pr_code.TabIndex = 79;
             this.pr_code.Tag = "1";
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1171, 108);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrinterList.Location = new System.Drawing.Point(878, 86);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(157, 25);
+            this.PrinterList.Size = new System.Drawing.Size(118, 20);
             this.PrinterList.TabIndex = 160;
             // 
             // StopWeight
@@ -604,13 +576,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(908, 30);
-            this.StopWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.StopWeight.Location = new System.Drawing.Point(681, 24);
+            this.StopWeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(72, 30);
+            this.StopWeight.Size = new System.Drawing.Size(54, 24);
             this.StopWeight.TabIndex = 158;
             this.StopWeight.Text = "停止称量";
             this.StopWeight.UseVisualStyleBackColor = true;
@@ -623,13 +595,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(803, 30);
-            this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.StartWeight.Location = new System.Drawing.Point(602, 24);
+            this.StartWeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(72, 30);
+            this.StartWeight.Size = new System.Drawing.Size(54, 24);
             this.StartWeight.TabIndex = 157;
             this.StartWeight.Text = "开始称量";
             this.StartWeight.UseVisualStyleBackColor = true;
@@ -642,13 +614,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(1171, 182);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Confirm.Location = new System.Drawing.Point(878, 146);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(67, 30);
+            this.Confirm.Size = new System.Drawing.Size(50, 24);
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "打印";
             this.Confirm.UseVisualStyleBackColor = true;
@@ -659,11 +631,10 @@
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.CutLength = null;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(172, 326);
-            this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.ms_makecode.Location = new System.Drawing.Point(129, 261);
+            this.ms_makecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.ms_makecode.Name = "ms_makecode";
-            this.ms_makecode.Size = new System.Drawing.Size(0, 32);
+            this.ms_makecode.Size = new System.Drawing.Size(0, 27);
             this.ms_makecode.TabIndex = 77;
             this.ms_makecode.Tag = "1";
             // 
@@ -672,35 +643,32 @@
             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(171, 559);
-            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.Location = new System.Drawing.Point(128, 447);
+            this.ma_qty.MaximumSize = new System.Drawing.Size(150, 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, 27);
             this.ma_qty.TabIndex = 76;
             // 
-            // pr_detail
+            // pr_machinetype
             // 
-            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(171, 502);
-            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.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 32);
-            this.pr_detail.TabIndex = 75;
+            this.pr_machinetype.AutoSize = true;
+            this.pr_machinetype.CutLength = null;
+            this.pr_machinetype.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_machinetype.Location = new System.Drawing.Point(128, 402);
+            this.pr_machinetype.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pr_machinetype.Name = "pr_machinetype";
+            this.pr_machinetype.Size = new System.Drawing.Size(0, 27);
+            this.pr_machinetype.TabIndex = 75;
             // 
             // ma_salecode
             // 
             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(171, 444);
-            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.Location = new System.Drawing.Point(128, 355);
+            this.ma_salecode.MaximumSize = new System.Drawing.Size(150, 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, 27);
             this.ma_salecode.TabIndex = 73;
             // 
             // Clean
@@ -710,13 +678,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(1144, 698);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Clean.Location = new System.Drawing.Point(858, 558);
+            this.Clean.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(80, 30);
+            this.Clean.Size = new System.Drawing.Size(60, 24);
             this.Clean.TabIndex = 60;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -729,8 +697,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(28, 68);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.normalButton1.Location = new System.Drawing.Point(21, 54);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -746,11 +714,11 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(147, 22);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.sncode.Location = new System.Drawing.Point(110, 18);
+            this.sncode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(624, 47);
+            this.sncode.Size = new System.Drawing.Size(469, 39);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -760,10 +728,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(1024, 361);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.OperateResult.Location = new System.Drawing.Point(768, 289);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(319, 325);
+            this.OperateResult.Size = new System.Drawing.Size(240, 261);
             this.OperateResult.TabIndex = 58;
             this.OperateResult.Text = "";
             // 
@@ -774,19 +742,18 @@
             this.locksalecode.CheckState = System.Windows.Forms.CheckState.Checked;
             this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.locksalecode.ForeColor = System.Drawing.Color.Red;
-            this.locksalecode.Location = new System.Drawing.Point(364, 332);
-            this.locksalecode.Margin = new System.Windows.Forms.Padding(4);
+            this.locksalecode.Location = new System.Drawing.Point(273, 266);
             this.locksalecode.Name = "locksalecode";
-            this.locksalecode.Size = new System.Drawing.Size(119, 19);
+            this.locksalecode.Size = new System.Drawing.Size(96, 16);
             this.locksalecode.TabIndex = 204;
             this.locksalecode.Text = "当前订单锁定";
             this.locksalecode.UseVisualStyleBackColor = true;
             // 
             // Make_ColorBoxWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1351, 730);
+            this.ClientSize = new System.Drawing.Size(1013, 584);
             this.Controls.Add(this.locksalecode);
             this.Controls.Add(this.CollectRemark);
             this.Controls.Add(this.Remark);
@@ -817,7 +784,7 @@
             this.Controls.Add(this.Confirm);
             this.Controls.Add(this.ms_makecode);
             this.Controls.Add(this.ma_qty);
-            this.Controls.Add(this.pr_detail);
+            this.Controls.Add(this.pr_machinetype);
             this.Controls.Add(this.ma_salecode);
             this.Controls.Add(this.ms_makecode_label);
             this.Controls.Add(this.Clean);
@@ -830,18 +797,18 @@
             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, 2, 4, 2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Make_ColorBoxWeigh";
             this.Tag = "Make!ColorBoxWeigh";
             this.Text = "彩盒称重";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.彩盒称重_FormClosing);
             this.Load += new System.EventHandler(this.Make_ColorBoxWeigh_Load);
             this.SizeChanged += new System.EventHandler(this.彩盒称重_SizeChanged);
-            this.panel4.ResumeLayout(true);
+            this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
-            this.groupBoxWithBorder2.ResumeLayout(true);
+            this.groupBoxWithBorder2.ResumeLayout(false);
             this.groupBoxWithBorder2.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -863,7 +830,7 @@
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.Label ms_makecode_label;
         private CustomControl.ValueLabel.ValueLabel ma_salecode;
-        private CustomControl.ValueLabel.ValueLabel pr_detail;
+        private CustomControl.ValueLabel.ValueLabel pr_machinetype;
         private CustomControl.ValueLabel.ValueLabel ma_qty;
         private CustomControl.ValueLabel.ValueLabel ms_makecode;
         private CustomControl.ValueLabel.ValueLabel pr_code;

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -91,7 +91,7 @@ namespace UAS_MES.Make
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
                     sql.Clear();
-                    sql.Append("select ms_makecode,ma_qty,ma_salecode,pr_detail,pr_colorboxunit,pr_code,pr_colorboxgw,");
+                    sql.Append("select ms_makecode,ma_qty,ma_salecode,pr_machinetype,pr_colorboxunit,pr_code,pr_colorboxgw,");
                     sql.Append("pr_colorboxunit,pr_colorboxmaxw,pr_colorboxminw,nvl(PR_CHECKCOLORBOXW,'0') PR_CHECKCOLORBOXW,nvl(pr_sendchecktype,'LineCode')");
                     sql.Append("pr_sendchecktype from makeserial left join make on ms_makecode=ma_code left join product on ");
                     sql.Append("ms_prodcode=pr_code where ms_sncode='" + sncode.Text + "' order by ms_id desc");

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.resx

@@ -177,7 +177,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -346,7 +346,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -477,7 +477,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -608,7 +608,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -739,7 +739,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -870,7 +870,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -378,6 +378,8 @@ namespace UAS_MES.Make
                                     sql.Append("(MAKEBADRSPART_seq.nextval, sysdate, '" + User.UserCode + "','" + ms_sncode.Text + "',:bc_code,'" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "','" + ms_makecode.Text + "','" + User.UserSourceCode + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "')");
                                     dh.BatchInsert(sql.GetString(), new string[] { "bc_code" }, bccode);
                                 }
+
+                                dh.ExecuteSql("update makeserial set ms_nextmacode = '' where ms_sncode = '"+ LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_nextmacode = '"+ LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'","update");
                             }
 
                             //此物料上线状态更新为-1,代表被拆解

UAS-MES/FunctionCode/Make/Make_Decompose_Ex.cs

@@ -378,6 +378,7 @@ namespace UAS_MES.Make
                                     sql.Append("(MAKEBADRSPART_seq.nextval, sysdate, '" + User.UserCode + "','" + ms_sncode.Text + "',:bc_code,'" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "','" + ms_makecode.Text + "','" + User.UserSourceCode + "','" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "')");
                                     dh.BatchInsert(sql.GetString(), new string[] { "bc_code" }, bccode);
                                 }
+                                dh.ExecuteSql("update makeserial set ms_nextmacode = '' where ms_sncode = '" + LabelDataGridView.Rows[i].Cells["cm_barcode"].Value + "' and ms_nextmacode = '" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value.ToString() + "'", "update");
                             }
 
                             //此物料上线状态更新为-1,代表被拆解

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -145,6 +145,11 @@ namespace UAS_MES.Make
                                 code.Text = "";
                                 return;
                             }
+                            if (!dh.CheckExist("make  left join craft on cr_prodcode = ma_prodcode and cr_code = ma_craftcode  left join craftdetail  on cd_crid = cr_id", " ma_code = '" + ma_code.Text + "' and nvl(cd_ifinput,0) = -1 and cd_stepcode = '" + User.CurrentStepCode + "'"))
+                            {
+                                OperateResult.AppendText(">>当前工单工序非上料工序\n", Color.Red);
+                                return;
+                            }
                             string sp_soncode = dt1.Rows[RemainIndex]["sp_soncode"].ToString();
                             string sp_fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
                             string sp_prefix = dt1.Rows[RemainIndex]["sp_prefix"].ToString();

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

@@ -414,9 +414,9 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_RePrintLabel_FormClosing);
             this.Load += new System.EventHandler(this.Make_RePrintLabel_Load);
             this.SizeChanged += new System.EventHandler(this.Make_RePrintLabel_SizeChanged);
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -103,7 +103,7 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                 clearAll();
             }
-            else if ((btn.Name == "CartonBox"||btn.Name== "BigBox"||btn.Name=="Pallte") && btn.Checked)
+            else if ((btn.Name == "CartonBox" || btn.Name == "BigBox" || btn.Name == "Pallte") && btn.Checked)
             {
                 OperateResult.AppendText(">>请输入箱号\n", Color.Black);
                 clearAll();
@@ -146,7 +146,7 @@ namespace UAS_MES.Make
                     inputText.Text = "";
                 }
                 //打印类型为卡通箱
-                else if (CartonBox.Checked||BigBox.Checked|| Pallte.Checked)
+                else if (CartonBox.Checked || BigBox.Checked || Pallte.Checked)
                 {
                     //查询箱号是否存在
                     dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and (pa_type=1 OR PA_TYPE = 2 or PA_TYPE=3)", "select");
@@ -246,7 +246,7 @@ namespace UAS_MES.Make
                 }
             }
             //打印类型为卡通箱标签
-            else if (CartonBox.Checked||BigBox.Checked|| Pallte.Checked)
+            else if (CartonBox.Checked || BigBox.Checked || Pallte.Checked)
             {
                 //select pa_downstatus from package where pa_outboxcode=? 输入值code
                 mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='" + inputValue.Text + "'", "select");
@@ -310,7 +310,7 @@ namespace UAS_MES.Make
             LogicHandler.GetSerialNumByCaller("MakeDown", out md_code);
             sql.Clear();
             sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
-            sql.Append(((CartonBox.Checked||BigBox.Checked||Pallte.Checked) ? "MD_OUTBOXCODE" : "MD_SNCODE") + ",MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
+            sql.Append(((CartonBox.Checked || BigBox.Checked || Pallte.Checked) ? "MD_OUTBOXCODE" : "MD_SNCODE") + ",MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
             sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) values (MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
             sql.Append("'" + User.CurrentStepCode + "','" + inputValue.Text + "','" + pr_code.Text + "','" + ms_makecode.Text + "','补打标签','" + md_code + "',sysdate,'" + User.UserCode + "','-1')");
             dh.ExecuteSql(sql.GetString(), "insert");
@@ -380,7 +380,7 @@ namespace UAS_MES.Make
                     }
                 }
                 //勾选的是卡通箱
-                else if (CartonBox.Checked||BigBox.Checked|| Pallte.Checked)
+                else if (CartonBox.Checked || BigBox.Checked || Pallte.Checked)
                 {
                     //第一次输入
                     if (TSN == "")
@@ -409,7 +409,7 @@ namespace UAS_MES.Make
                             if (infoc.Rows[0]["pa_downstatus"].ToString() != "0")
                             {
                                 //判断下地原因是否是补打标签,是才能取消下地
-                                if (dh.CheckExist("makedown", "Md_OUTBOXCODE='" + TSN + "' AND nvl(Md_PRODCODE,' ')='" + (infoc.Rows[0]["pa_prodcode"].ToString()==""?" ":infoc.Rows[0]["pa_prodcode"].ToString()) + "' AND Md_STATUS=-1  AND MD_DOWNREASON='补打标签'"))
+                                if (dh.CheckExist("makedown", "Md_OUTBOXCODE='" + TSN + "' AND nvl(Md_PRODCODE,' ')='" + (infoc.Rows[0]["pa_prodcode"].ToString() == "" ? " " : infoc.Rows[0]["pa_prodcode"].ToString()) + "' AND Md_STATUS=-1  AND MD_DOWNREASON='补打标签'"))
                                 {
                                     sql.Clear();
                                     sql.Append("update makedown set md_status=0,Md_UPREASON='标签补打核对',Md_UPMAN='" + User.UserCode + "',Md_UPDATE=SYSDATE WHERE Md_OUTBOXCODE='" + TSN + "' AND Md_PRODCODE='" + infoc.Rows[0]["pa_prodcode"].ToString() + "' AND Md_STATUS=-1  AND MD_DOWNREASON='补打标签'");

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

@@ -96,6 +96,7 @@
             this.NewBadCode = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.SaveBadLocation = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.QuickRepair = new System.Windows.Forms.CheckBox();
+            this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -653,6 +654,7 @@
             this.mb_badremark.TabIndex = 127;
             this.mb_badremark.TextAreaEnable = true;
             this.mb_badremark.TextBoxEnable = true;
+            this.mb_badremark.Leave += new System.EventHandler(this.mb_badremark_Leave);
             // 
             // bd_soncode
             // 
@@ -794,7 +796,7 @@
             this.NewRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.DownImage")));
             this.NewRepairInf.Image = null;
             this.NewRepairInf.IsShowBorder = true;
-            this.NewRepairInf.Location = new System.Drawing.Point(292, 493);
+            this.NewRepairInf.Location = new System.Drawing.Point(276, 493);
             this.NewRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.MoveImage")));
             this.NewRepairInf.Name = "NewRepairInf";
             this.NewRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.NormalImage")));
@@ -832,15 +834,15 @@
             this.DeleteRepairInf.DownImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.DownImage")));
             this.DeleteRepairInf.Image = null;
             this.DeleteRepairInf.IsShowBorder = true;
-            this.DeleteRepairInf.Location = new System.Drawing.Point(421, 493);
+            this.DeleteRepairInf.Location = new System.Drawing.Point(515, 493);
             this.DeleteRepairInf.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.MoveImage")));
             this.DeleteRepairInf.Name = "DeleteRepairInf";
             this.DeleteRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.NormalImage")));
             this.DeleteRepairInf.Power = null;
-            this.DeleteRepairInf.Size = new System.Drawing.Size(57, 24);
+            this.DeleteRepairInf.Size = new System.Drawing.Size(108, 24);
             this.DeleteRepairInf.TabIndex = 110;
             this.DeleteRepairInf.Tag = "IfRead";
-            this.DeleteRepairInf.Text = "删除";
+            this.DeleteRepairInf.Text = "删除不良原因";
             this.DeleteRepairInf.UseVisualStyleBackColor = true;
             this.DeleteRepairInf.Click += new System.EventHandler(this.DeleteRepairInf_Click);
             // 
@@ -977,11 +979,30 @@
             this.QuickRepair.Text = "SMT回流";
             this.QuickRepair.UseVisualStyleBackColor = true;
             // 
+            // normalButton1
+            // 
+            this.normalButton1.AllPower = null;
+            this.normalButton1.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
+            this.normalButton1.Image = null;
+            this.normalButton1.IsShowBorder = true;
+            this.normalButton1.Location = new System.Drawing.Point(400, 493);
+            this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
+            this.normalButton1.Name = "normalButton1";
+            this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
+            this.normalButton1.Power = null;
+            this.normalButton1.Size = new System.Drawing.Size(109, 26);
+            this.normalButton1.TabIndex = 141;
+            this.normalButton1.Text = "删除不良代码";
+            this.normalButton1.UseVisualStyleBackColor = false;
+            this.normalButton1.Click += new System.EventHandler(this.normalButton1_Click);
+            // 
             // Make_Repair
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(900, 579);
+            this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.QuickRepair);
             this.Controls.Add(this.mbc_component);
             this.Controls.Add(this.mbr_dutycode);
@@ -1109,5 +1130,6 @@
         private System.Windows.Forms.Label mbr_dutycode;
         private CustomControl.ComBoxWithFocus.ComBoxWithFocus mbc_component;
         private System.Windows.Forms.CheckBox QuickRepair;
+        private CustomControl.ButtonUtil.NormalButton normalButton1;
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -982,5 +982,46 @@ namespace UAS_MES.Make
             if (so_code.Text == "" || (so_code.Text != "" && so_code.Text != so_name.Value))
                 so_code.Text = so_name.Value;
         }
+
+        private void mb_badremark_Leave(object sender, EventArgs e)
+        {
+            if (bc_code.Text != "")
+            {
+                dh.ExecuteSql("update makebad set mb_badremark = '"+ mb_badremark.Text + "' where mb_id = '"+ mb_id + "'", "update");
+                OperatResult.AppendText(">>更新备注成功\n", Color.Green);
+            }
+            else
+            {
+                mb_badremark.Text = "";
+                OperatResult.AppendText(">>请先选择不良代码\n", Color.Red);
+            }
+        }
+
+        private void normalButton1_Click(object sender, EventArgs e)
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode from makeserial where ms_id='" + msid + "' and ms_sncode='" + GetSNCode.Text + "' and ms_status=3", "select");
+            if (dt.Rows.Count > 0)
+            {
+                if (mb_id != "")
+                {
+
+                    string delete1 = "delete from makebadrsloc where mbl_mbrid in (select mbr_id from makebadreason where mbr_mbid = '" + mb_id + "' )";
+                    string delete2 = "delete from makebadrspart where mbp_mbrid in (select mbr_id from makebadreason where mbr_mbid = '" + mb_id + "' )";
+                    string delete3 = "delete from makebadrscom where mbc_mbrid in (select mbr_id from makebadreason where mbr_mbid = '" + mb_id + "' )";
+                    string delete4 = "delete from makebadreason where mbr_mbid='" + mb_id + "'";
+                    string delete = "delete from makebad where mb_id = '" + mb_id + "'";
+                    dh.ExecuteSQLTran(delete1, delete2, delete3, delete4, delete);
+                    OperatResult.AppendText(">>删除成功\n", Color.Green);
+                    BaseUtil.CleanControlsText(bc_name, bc_code, bg_name, bg_code, mb_badremark, nrg_name, nrg_code, nr_name, nr_code, so_name, so_code, mbr_dutyname, mbr_dutycode, mbc_component);
+                    mbp_partdgv.DataSource = null;
+                    mbl_locdgv.DataSource = null;
+                    mb_id = "";
+                    //删除后重新加载Tree的信息
+                    LoadBadInfTree(sender, e);
+                }
+                else OperatResult.AppendText(">>必须选择不良现象\n", Color.Red);
+            }
+            else OperatResult.AppendText(">>" + GetSNCode.Text + "序列号错误，不存在或者不处于维修状态\n", Color.Red);
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -206,18 +206,6 @@
   <metadata name="DeleteCom.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DeleteCom.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DeletePos.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -450,6 +438,44 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="normalButton1.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="normalButton1.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="normalButton1.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@@ -44,16 +44,10 @@
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.mc_restqty_label = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.ob_sendqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.label7 = new System.Windows.Forms.Label();
             this.ob_checkno = new System.Windows.Forms.Label();
-            this.SendCheck = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.ob_batchqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ob_batchqty_label = new System.Windows.Forms.Label();
-            this.ob_nowcheckqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ob_nowcheckqty_label = new System.Windows.Forms.Label();
-            this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.mcd_inqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ma_softversion_label = new System.Windows.Forms.Label();
             this.BadInfSource = new System.Windows.Forms.BindingSource(this.components);
@@ -63,22 +57,7 @@
             this.ma_salecode = new System.Windows.Forms.Label();
             this.pr_sendchecktype = new System.Windows.Forms.Label();
             this.MakeBadView = new System.Windows.Forms.DataGridView();
-            this.choose1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.mb_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mbr_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_badname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_bgname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mbc_component = new System.Windows.Forms.DataGridViewComboBoxColumn();
-            this.mbp_part = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.mbl_loc = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WaitChooseDGV = new System.Windows.Forms.DataGridView();
-            this.ChooseAll = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.badloc_label = new System.Windows.Forms.Label();
             this.mbp_part_label = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
@@ -97,11 +76,33 @@
             this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.psl_location = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bd_soncode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ChooseAll = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bg_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bg_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.choose1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.mb_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mbr_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_badname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_bgname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mbc_component = new System.Windows.Forms.DataGridViewComboBoxColumn();
+            this.mbp_part = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mbl_loc = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.Filter = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder();
             this.ma_softversion = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ob_sendqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.SendCheck = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.ob_batchqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ob_nowcheckqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.mcd_inqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.LockMakeCode = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
@@ -284,19 +285,6 @@
             this.panel1.Size = new System.Drawing.Size(315, 127);
             this.panel1.TabIndex = 71;
             // 
-            // ob_sendqty
-            // 
-            this.ob_sendqty.AutoSize = true;
-            this.ob_sendqty.CutLength = null;
-            this.ob_sendqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_sendqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_sendqty.Location = new System.Drawing.Point(109, 91);
-            this.ob_sendqty.MaximumSize = new System.Drawing.Size(150, 0);
-            this.ob_sendqty.Name = "ob_sendqty";
-            this.ob_sendqty.Size = new System.Drawing.Size(0, 21);
-            this.ob_sendqty.TabIndex = 78;
-            this.ob_sendqty.Tag = "ob_batchqty";
-            // 
             // label7
             // 
             this.label7.AutoSize = true;
@@ -321,39 +309,6 @@
             this.ob_checkno.Visible = false;
             this.ob_checkno.TextChanged += new System.EventHandler(this.ob_checkno_TextChanged);
             // 
-            // SendCheck
-            // 
-            this.SendCheck.AllPower = null;
-            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
-            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
-            this.SendCheck.Enabled = false;
-            this.SendCheck.Image = null;
-            this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(229, 90);
-            this.SendCheck.Margin = new System.Windows.Forms.Padding(2);
-            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
-            this.SendCheck.Name = "SendCheck";
-            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
-            this.SendCheck.Power = null;
-            this.SendCheck.Size = new System.Drawing.Size(65, 26);
-            this.SendCheck.TabIndex = 72;
-            this.SendCheck.Text = "送检";
-            this.SendCheck.UseVisualStyleBackColor = false;
-            this.SendCheck.Click += new System.EventHandler(this.SendCheck_Click);
-            // 
-            // ob_batchqty
-            // 
-            this.ob_batchqty.AutoSize = true;
-            this.ob_batchqty.CutLength = null;
-            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_batchqty.Location = new System.Drawing.Point(109, 51);
-            this.ob_batchqty.MaximumSize = new System.Drawing.Size(150, 0);
-            this.ob_batchqty.Name = "ob_batchqty";
-            this.ob_batchqty.Size = new System.Drawing.Size(0, 21);
-            this.ob_batchqty.TabIndex = 75;
-            this.ob_batchqty.Tag = "ob_batchqty";
-            // 
             // ob_batchqty_label
             // 
             this.ob_batchqty_label.AutoSize = true;
@@ -365,19 +320,6 @@
             this.ob_batchqty_label.TabIndex = 74;
             this.ob_batchqty_label.Text = "抽检批数";
             // 
-            // ob_nowcheckqty
-            // 
-            this.ob_nowcheckqty.AutoSize = true;
-            this.ob_nowcheckqty.CutLength = null;
-            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.ForeColor = System.Drawing.Color.Black;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(248, 51);
-            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(150, 0);
-            this.ob_nowcheckqty.Name = "ob_nowcheckqty";
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 21);
-            this.ob_nowcheckqty.TabIndex = 73;
-            this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
-            // 
             // ob_nowcheckqty_label
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
@@ -389,30 +331,6 @@
             this.ob_nowcheckqty_label.TabIndex = 72;
             this.ob_nowcheckqty_label.Text = "当前批数";
             // 
-            // mcd_remainqty
-            // 
-            this.mcd_remainqty.AutoSize = true;
-            this.mcd_remainqty.CutLength = null;
-            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(109, 12);
-            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(150, 0);
-            this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 21);
-            this.mcd_remainqty.TabIndex = 57;
-            this.mcd_remainqty.Tag = "mcd_remainqty";
-            // 
-            // mcd_inqty
-            // 
-            this.mcd_inqty.AutoSize = true;
-            this.mcd_inqty.CutLength = null;
-            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(248, 12);
-            this.mcd_inqty.MaximumSize = new System.Drawing.Size(150, 0);
-            this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 21);
-            this.mcd_inqty.TabIndex = 54;
-            this.mcd_inqty.Tag = "mcd_inqty";
-            // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
@@ -436,16 +354,15 @@
             // NoteForChange
             // 
             this.NoteForChange.AutoSize = true;
-            this.NoteForChange.Checked = true;
-            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(300, 112);
             this.NoteForChange.Margin = new System.Windows.Forms.Padding(2);
             this.NoteForChange.Name = "NoteForChange";
             this.NoteForChange.Size = new System.Drawing.Size(99, 21);
             this.NoteForChange.TabIndex = 75;
-            this.NoteForChange.Text = "切换工单提示";
+            this.NoteForChange.Text = "自动归属工单";
             this.NoteForChange.UseVisualStyleBackColor = true;
+            this.NoteForChange.Click += new System.EventHandler(this.NoteForChange_Click);
             // 
             // Lock_label
             // 
@@ -501,92 +418,6 @@
             this.MakeBadView.Size = new System.Drawing.Size(412, 223);
             this.MakeBadView.TabIndex = 195;
             // 
-            // choose1
-            // 
-            this.choose1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.choose1.HeaderText = "勾选";
-            this.choose1.MinimumWidth = 60;
-            this.choose1.Name = "choose1";
-            this.choose1.Width = 60;
-            // 
-            // mb_id
-            // 
-            this.mb_id.DataPropertyName = "mb_id";
-            this.mb_id.HeaderText = "mb_id";
-            this.mb_id.Name = "mb_id";
-            this.mb_id.Visible = false;
-            // 
-            // mbr_id
-            // 
-            this.mbr_id.DataPropertyName = "mbr_id";
-            this.mbr_id.HeaderText = "mbr_id";
-            this.mbr_id.Name = "mbr_id";
-            this.mbr_id.Visible = false;
-            // 
-            // mb_badcode
-            // 
-            this.mb_badcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.mb_badcode.DataPropertyName = "mb_badcode";
-            this.mb_badcode.HeaderText = "不良代码";
-            this.mb_badcode.MinimumWidth = 80;
-            this.mb_badcode.Name = "mb_badcode";
-            this.mb_badcode.ReadOnly = true;
-            this.mb_badcode.Width = 80;
-            // 
-            // mb_badname
-            // 
-            this.mb_badname.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.mb_badname.DataPropertyName = "mb_badname";
-            this.mb_badname.HeaderText = "不良名称";
-            this.mb_badname.MinimumWidth = 80;
-            this.mb_badname.Name = "mb_badname";
-            this.mb_badname.ReadOnly = true;
-            this.mb_badname.Width = 80;
-            // 
-            // mb_bgname
-            // 
-            this.mb_bgname.DataPropertyName = "mb_bgname";
-            this.mb_bgname.HeaderText = "不良代码组描述";
-            this.mb_bgname.Name = "mb_bgname";
-            this.mb_bgname.Visible = false;
-            // 
-            // mb_bgcode
-            // 
-            this.mb_bgcode.DataPropertyName = "mb_bgcode";
-            this.mb_bgcode.HeaderText = "不良代码组编号";
-            this.mb_bgcode.Name = "mb_bgcode";
-            this.mb_bgcode.Visible = false;
-            // 
-            // mbc_component
-            // 
-            this.mbc_component.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.mbc_component.DataPropertyName = "mbc_component";
-            this.mbc_component.HeaderText = "不良组件";
-            this.mbc_component.Items.AddRange(new object[] {
-            "",
-            "主板",
-            "液晶屏",
-            "电路板",
-            "其他"});
-            this.mbc_component.MinimumWidth = 80;
-            this.mbc_component.Name = "mbc_component";
-            this.mbc_component.Width = 80;
-            // 
-            // mbp_part
-            // 
-            this.mbp_part.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.mbp_part.DataPropertyName = "mbp_part";
-            this.mbp_part.HeaderText = "不良零件";
-            this.mbp_part.Name = "mbp_part";
-            // 
-            // mbl_loc
-            // 
-            this.mbl_loc.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.mbl_loc.DataPropertyName = "mbl_loc";
-            this.mbl_loc.HeaderText = "不良位置";
-            this.mbl_loc.MinimumWidth = 45;
-            this.mbl_loc.Name = "mbl_loc";
-            // 
             // WaitChooseDGV
             // 
             this.WaitChooseDGV.AllowUserToAddRows = false;
@@ -606,45 +437,6 @@
             this.WaitChooseDGV.Size = new System.Drawing.Size(235, 223);
             this.WaitChooseDGV.TabIndex = 208;
             // 
-            // ChooseAll
-            // 
-            this.ChooseAll.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.ChooseAll.HeaderText = "勾选";
-            this.ChooseAll.MinimumWidth = 80;
-            this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.ChooseAll.Width = 80;
-            // 
-            // bc_code
-            // 
-            this.bc_code.DataPropertyName = "bc_code";
-            this.bc_code.HeaderText = "不良代码";
-            this.bc_code.Name = "bc_code";
-            this.bc_code.ReadOnly = true;
-            this.bc_code.Width = 130;
-            // 
-            // bc_name
-            // 
-            this.bc_name.DataPropertyName = "bc_name";
-            this.bc_name.HeaderText = "不良名称";
-            this.bc_name.Name = "bc_name";
-            this.bc_name.ReadOnly = true;
-            this.bc_name.Width = 130;
-            // 
-            // bg_code
-            // 
-            this.bg_code.DataPropertyName = "bg_code";
-            this.bg_code.HeaderText = "不良组别编号";
-            this.bg_code.Name = "bg_code";
-            this.bg_code.Visible = false;
-            // 
-            // bg_name
-            // 
-            this.bg_name.DataPropertyName = "bg_name";
-            this.bg_name.HeaderText = "不良组别名称";
-            this.bg_name.Name = "bg_name";
-            this.bg_name.Visible = false;
-            // 
             // badloc_label
             // 
             this.badloc_label.AutoSize = true;
@@ -803,6 +595,20 @@
             this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
             this.dataGridViewTextBoxColumn12.Visible = false;
             // 
+            // enterTextBox1
+            // 
+            this.enterTextBox1.AllPower = null;
+            this.enterTextBox1.BackColor = System.Drawing.Color.White;
+            this.enterTextBox1.ID = null;
+            this.enterTextBox1.Location = new System.Drawing.Point(42, 222);
+            this.enterTextBox1.Name = "enterTextBox1";
+            this.enterTextBox1.Power = null;
+            this.enterTextBox1.Size = new System.Drawing.Size(0, 21);
+            this.enterTextBox1.Str = null;
+            this.enterTextBox1.Str1 = null;
+            this.enterTextBox1.Str2 = null;
+            this.enterTextBox1.TabIndex = 217;
+            // 
             // psl_location
             // 
             this.psl_location.AllPower = null;
@@ -839,6 +645,131 @@
             this.bd_soncode.Tag = "psl_prodcode";
             this.bd_soncode.TextBoxEnable = true;
             // 
+            // ChooseAll
+            // 
+            this.ChooseAll.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.ChooseAll.HeaderText = "勾选";
+            this.ChooseAll.MinimumWidth = 80;
+            this.ChooseAll.Name = "ChooseAll";
+            this.ChooseAll.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ChooseAll.Width = 80;
+            // 
+            // bc_code
+            // 
+            this.bc_code.DataPropertyName = "bc_code";
+            this.bc_code.HeaderText = "不良代码";
+            this.bc_code.Name = "bc_code";
+            this.bc_code.ReadOnly = true;
+            this.bc_code.Width = 130;
+            // 
+            // bc_name
+            // 
+            this.bc_name.DataPropertyName = "bc_name";
+            this.bc_name.HeaderText = "不良名称";
+            this.bc_name.Name = "bc_name";
+            this.bc_name.ReadOnly = true;
+            this.bc_name.Width = 130;
+            // 
+            // bg_code
+            // 
+            this.bg_code.DataPropertyName = "bg_code";
+            this.bg_code.HeaderText = "不良组别编号";
+            this.bg_code.Name = "bg_code";
+            this.bg_code.Visible = false;
+            // 
+            // bg_name
+            // 
+            this.bg_name.DataPropertyName = "bg_name";
+            this.bg_name.HeaderText = "不良组别名称";
+            this.bg_name.Name = "bg_name";
+            this.bg_name.Visible = false;
+            // 
+            // choose1
+            // 
+            this.choose1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.choose1.HeaderText = "勾选";
+            this.choose1.MinimumWidth = 60;
+            this.choose1.Name = "choose1";
+            this.choose1.Width = 60;
+            // 
+            // mb_id
+            // 
+            this.mb_id.DataPropertyName = "mb_id";
+            this.mb_id.HeaderText = "mb_id";
+            this.mb_id.Name = "mb_id";
+            this.mb_id.Visible = false;
+            // 
+            // mbr_id
+            // 
+            this.mbr_id.DataPropertyName = "mbr_id";
+            this.mbr_id.HeaderText = "mbr_id";
+            this.mbr_id.Name = "mbr_id";
+            this.mbr_id.Visible = false;
+            // 
+            // mb_badcode
+            // 
+            this.mb_badcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.mb_badcode.DataPropertyName = "mb_badcode";
+            this.mb_badcode.HeaderText = "不良代码";
+            this.mb_badcode.MinimumWidth = 80;
+            this.mb_badcode.Name = "mb_badcode";
+            this.mb_badcode.ReadOnly = true;
+            this.mb_badcode.Width = 80;
+            // 
+            // mb_badname
+            // 
+            this.mb_badname.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.mb_badname.DataPropertyName = "mb_badname";
+            this.mb_badname.HeaderText = "不良名称";
+            this.mb_badname.MinimumWidth = 80;
+            this.mb_badname.Name = "mb_badname";
+            this.mb_badname.ReadOnly = true;
+            this.mb_badname.Width = 80;
+            // 
+            // mb_bgname
+            // 
+            this.mb_bgname.DataPropertyName = "mb_bgname";
+            this.mb_bgname.HeaderText = "不良代码组描述";
+            this.mb_bgname.Name = "mb_bgname";
+            this.mb_bgname.Visible = false;
+            // 
+            // mb_bgcode
+            // 
+            this.mb_bgcode.DataPropertyName = "mb_bgcode";
+            this.mb_bgcode.HeaderText = "不良代码组编号";
+            this.mb_bgcode.Name = "mb_bgcode";
+            this.mb_bgcode.Visible = false;
+            // 
+            // mbc_component
+            // 
+            this.mbc_component.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.mbc_component.DataPropertyName = "mbc_component";
+            this.mbc_component.HeaderText = "不良组件";
+            this.mbc_component.Items.AddRange(new object[] {
+            "",
+            "主板",
+            "液晶屏",
+            "电路板",
+            "其他"});
+            this.mbc_component.MinimumWidth = 80;
+            this.mbc_component.Name = "mbc_component";
+            this.mbc_component.Width = 80;
+            // 
+            // mbp_part
+            // 
+            this.mbp_part.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.mbp_part.DataPropertyName = "mbp_part";
+            this.mbp_part.HeaderText = "不良零件";
+            this.mbp_part.Name = "mbp_part";
+            // 
+            // mbl_loc
+            // 
+            this.mbl_loc.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.mbl_loc.DataPropertyName = "mbl_loc";
+            this.mbl_loc.HeaderText = "不良位置";
+            this.mbl_loc.MinimumWidth = 45;
+            this.mbl_loc.Name = "mbl_loc";
+            // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
@@ -874,6 +805,89 @@
             this.ma_softversion.Size = new System.Drawing.Size(0, 21);
             this.ma_softversion.TabIndex = 73;
             // 
+            // ob_sendqty
+            // 
+            this.ob_sendqty.AutoSize = true;
+            this.ob_sendqty.CutLength = null;
+            this.ob_sendqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_sendqty.ForeColor = System.Drawing.Color.Black;
+            this.ob_sendqty.Location = new System.Drawing.Point(109, 91);
+            this.ob_sendqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ob_sendqty.Name = "ob_sendqty";
+            this.ob_sendqty.Size = new System.Drawing.Size(0, 21);
+            this.ob_sendqty.TabIndex = 78;
+            this.ob_sendqty.Tag = "ob_batchqty";
+            // 
+            // SendCheck
+            // 
+            this.SendCheck.AllPower = null;
+            this.SendCheck.BackColor = System.Drawing.Color.Transparent;
+            this.SendCheck.DownImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.DownImage")));
+            this.SendCheck.Enabled = false;
+            this.SendCheck.Image = null;
+            this.SendCheck.IsShowBorder = true;
+            this.SendCheck.Location = new System.Drawing.Point(229, 90);
+            this.SendCheck.Margin = new System.Windows.Forms.Padding(2);
+            this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
+            this.SendCheck.Name = "SendCheck";
+            this.SendCheck.NormalImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.NormalImage")));
+            this.SendCheck.Power = null;
+            this.SendCheck.Size = new System.Drawing.Size(65, 26);
+            this.SendCheck.TabIndex = 72;
+            this.SendCheck.Text = "送检";
+            this.SendCheck.UseVisualStyleBackColor = false;
+            this.SendCheck.Click += new System.EventHandler(this.SendCheck_Click);
+            // 
+            // ob_batchqty
+            // 
+            this.ob_batchqty.AutoSize = true;
+            this.ob_batchqty.CutLength = null;
+            this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_batchqty.ForeColor = System.Drawing.Color.Black;
+            this.ob_batchqty.Location = new System.Drawing.Point(109, 51);
+            this.ob_batchqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ob_batchqty.Name = "ob_batchqty";
+            this.ob_batchqty.Size = new System.Drawing.Size(0, 21);
+            this.ob_batchqty.TabIndex = 75;
+            this.ob_batchqty.Tag = "ob_batchqty";
+            // 
+            // ob_nowcheckqty
+            // 
+            this.ob_nowcheckqty.AutoSize = true;
+            this.ob_nowcheckqty.CutLength = null;
+            this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_nowcheckqty.ForeColor = System.Drawing.Color.Black;
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(248, 51);
+            this.ob_nowcheckqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.ob_nowcheckqty.Name = "ob_nowcheckqty";
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 21);
+            this.ob_nowcheckqty.TabIndex = 73;
+            this.ob_nowcheckqty.Tag = "ob_nowcheckqty";
+            // 
+            // mcd_remainqty
+            // 
+            this.mcd_remainqty.AutoSize = true;
+            this.mcd_remainqty.CutLength = null;
+            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty.Location = new System.Drawing.Point(109, 12);
+            this.mcd_remainqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.mcd_remainqty.Name = "mcd_remainqty";
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_remainqty.TabIndex = 57;
+            this.mcd_remainqty.Tag = "mcd_remainqty";
+            // 
+            // mcd_inqty
+            // 
+            this.mcd_inqty.AutoSize = true;
+            this.mcd_inqty.CutLength = null;
+            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty.Location = new System.Drawing.Point(248, 12);
+            this.mcd_inqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.mcd_inqty.Name = "mcd_inqty";
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 21);
+            this.mcd_inqty.TabIndex = 54;
+            this.mcd_inqty.Tag = "mcd_inqty";
+            // 
             // Save
             // 
             this.Save.AllPower = null;
@@ -1045,6 +1059,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(862, 535);
+            this.Controls.Add(this.enterTextBox1);
             this.Controls.Add(this.badloc_label);
             this.Controls.Add(this.psl_location);
             this.Controls.Add(this.bd_soncode);
@@ -1189,5 +1204,6 @@
         private UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox bd_soncode;
         private System.Windows.Forms.Label mbp_part_label;
         private System.Windows.Forms.Label label5;
+        private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox1;
     }
 }

UAS-MES/FunctionCode/Make/Make_SmtTestCollection.cs

@@ -232,21 +232,48 @@ namespace UAS_MES.Make
                 ChoosedList.Clear();
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
+                    bool NoteAlready = true;
                     //是否提示过工单切换框，检测前执行
-                    bool NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(ms_sncode.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
-                    if (!NoteAlready)
+                    if (NoteForChange.Checked)
                     {
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
-                        return;
+                         NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheck(ms_sncode.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
+                        if (!NoteAlready)
+                        {
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                            return;
+                        }
                     }
-                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    else
                     {
-                        //是否提示过工单切换框，检测前后执行
-                        if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text,oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
+                         NoteAlready = LogicHandler.CheckDiffMakeCodeBeforeStepCheckSP(ms_sncode.Text, ma_code.Text, NoteForChange.Checked, out oMakeCode, out ErrorMessage);
+                        if (!NoteAlready)
                         {
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                            enterTextBox1.Focus();
                             return;
                         }
+                    }
+                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    {
+                        if (NoteForChange.Checked)
+                        {
+                            //是否提示过工单切换框，检测前后执行
+                            if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
+                            {
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                                return;
+                            }
+                        }
+                        else
+                        {
+                            //是否提示过工单切换框，检测前后执行
+                            if (!LogicHandler.CheckDiffMakeCodeAfterStepCheckSP(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
+                            {
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                                enterTextBox1.Focus();
+                                return;
+                            }
+                        }
                         if (ma_code.Text != oMakeCode && oMakeCode != null)
                         {
                             dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,ma_softversion,ma_salecode,pr_detail,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
@@ -544,7 +571,7 @@ namespace UAS_MES.Make
                      status = dt.Rows[0]["ms_status"].ToString();
                     if (status == "1" || status == "2")
                     {
-                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
+                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss'),sp_linecode = '" + User.UserLineCode + "',sp_sccode = '" + User.UserSourceCode + "'", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "测试不良", User.UserCode);
@@ -1095,5 +1122,18 @@ namespace UAS_MES.Make
                 ChooseedReject_Click(sender, e);
             }
         }
+
+        private void NoteForChange_Click(object sender, EventArgs e)
+        {
+            if (SystemInf.Caller[this.FindForm().Tag.ToString()]["IFSPECIAL"])
+                return ;
+            else
+            {
+                NoteForChange.Checked = !NoteForChange.Checked;
+                MessageBox.Show("此操作需要特殊权限", "提示", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                
+                return ;
+            }
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -518,7 +518,7 @@ namespace UAS_MES.Make
                     string status = dt.Rows[0]["ms_status"].ToString();
                     if (status == "1" || status == "2")
                     {
-                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss')", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
+                        dh.UpdateByCondition("steppassed", "sp_result='不良品',sp_ifng=-1,sp_ymd=to_char(sysdate,'yyyymmdd'),sp_hm=to_char(sysdate,'hh24miss'),sp_linecode = '"+User.UserLineCode+"',sp_sccode = '"+User.UserSourceCode+"'", "sp_id=(select max(sp_id) from steppassed where sp_sncode='" + ms_sncode.Text + "')");
                         dh.UpdateByCondition("makecraftdetail", "mcd_okqty=mcd_okqty-1", "mcd_macode='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_badtimes=nvl(ms_badtimes,0)+1", "ms_id='" + oMSID + "'");
                         LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "良品采集成不良", "测试不良", User.UserCode);

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

@@ -48,6 +48,13 @@
             this.inputValue = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.label3 = new System.Windows.Forms.Label();
+            this.MEID = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.OTHCODE1 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.OTHCODE2 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.OTHCODE3 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.OTHID1 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.OTHID2 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
+            this.OTHID3 = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.collectCodeRules)).BeginInit();
             this.collects.SuspendLayout();
             this.SuspendLayout();
@@ -63,12 +70,12 @@
             this.psr_length,
             this.Column1});
             this.collectCodeRules.Enabled = false;
-            this.collectCodeRules.Location = new System.Drawing.Point(186, 47);
+            this.collectCodeRules.Location = new System.Drawing.Point(314, 47);
             this.collectCodeRules.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.collectCodeRules.Name = "collectCodeRules";
             this.collectCodeRules.RowHeadersVisible = false;
             this.collectCodeRules.RowTemplate.Height = 30;
-            this.collectCodeRules.Size = new System.Drawing.Size(489, 157);
+            this.collectCodeRules.Size = new System.Drawing.Size(361, 157);
             this.collectCodeRules.TabIndex = 6;
             // 
             // psr_type
@@ -103,7 +110,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(183, 17);
+            this.label1.Location = new System.Drawing.Point(310, 12);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(74, 21);
@@ -137,6 +144,13 @@
             // collects
             // 
             this.collects.BorderColor = System.Drawing.Color.Black;
+            this.collects.Controls.Add(this.OTHID3);
+            this.collects.Controls.Add(this.OTHID2);
+            this.collects.Controls.Add(this.OTHID1);
+            this.collects.Controls.Add(this.OTHCODE3);
+            this.collects.Controls.Add(this.OTHCODE2);
+            this.collects.Controls.Add(this.OTHCODE1);
+            this.collects.Controls.Add(this.MEID);
             this.collects.Controls.Add(this.Mac);
             this.collects.Controls.Add(this.Bt);
             this.collects.Controls.Add(this.NetCode);
@@ -147,7 +161,7 @@
             this.collects.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.collects.Name = "collects";
             this.collects.Padding = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.collects.Size = new System.Drawing.Size(149, 191);
+            this.collects.Size = new System.Drawing.Size(288, 191);
             this.collects.TabIndex = 92;
             this.collects.TabStop = false;
             this.collects.TextColor = System.Drawing.Color.Black;
@@ -156,7 +170,7 @@
             // 
             this.Mac.AutoSize = true;
             this.Mac.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Mac.Location = new System.Drawing.Point(25, 15);
+            this.Mac.Location = new System.Drawing.Point(4, 16);
             this.Mac.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Mac.Name = "Mac";
             this.Mac.Power = null;
@@ -170,7 +184,7 @@
             // 
             this.Bt.AutoSize = true;
             this.Bt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Bt.Location = new System.Drawing.Point(25, 44);
+            this.Bt.Location = new System.Drawing.Point(4, 43);
             this.Bt.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Bt.Name = "Bt";
             this.Bt.Power = null;
@@ -184,7 +198,7 @@
             // 
             this.NetCode.AutoSize = true;
             this.NetCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NetCode.Location = new System.Drawing.Point(25, 73);
+            this.NetCode.Location = new System.Drawing.Point(4, 70);
             this.NetCode.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.NetCode.Name = "NetCode";
             this.NetCode.Power = null;
@@ -198,7 +212,7 @@
             // 
             this.Imei1.AutoSize = true;
             this.Imei1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Imei1.Location = new System.Drawing.Point(25, 102);
+            this.Imei1.Location = new System.Drawing.Point(4, 102);
             this.Imei1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Imei1.Name = "Imei1";
             this.Imei1.Power = null;
@@ -212,7 +226,7 @@
             // 
             this.Imei2.AutoSize = true;
             this.Imei2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Imei2.Location = new System.Drawing.Point(25, 131);
+            this.Imei2.Location = new System.Drawing.Point(4, 129);
             this.Imei2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Imei2.Name = "Imei2";
             this.Imei2.Power = null;
@@ -226,7 +240,7 @@
             // 
             this.Imei3.AutoSize = true;
             this.Imei3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Imei3.Location = new System.Drawing.Point(25, 160);
+            this.Imei3.Location = new System.Drawing.Point(4, 156);
             this.Imei3.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Imei3.Name = "Imei3";
             this.Imei3.Power = null;
@@ -272,6 +286,97 @@
             this.label3.TabIndex = 93;
             this.label3.Text = "输入框";
             // 
+            // MEID
+            // 
+            this.MEID.AutoSize = true;
+            this.MEID.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.MEID.Location = new System.Drawing.Point(210, 156);
+            this.MEID.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.MEID.Name = "MEID";
+            this.MEID.Power = null;
+            this.MEID.Size = new System.Drawing.Size(71, 25);
+            this.MEID.TabIndex = 6;
+            this.MEID.Text = "MEID";
+            this.MEID.UseVisualStyleBackColor = true;
+            // 
+            // OTHCODE1
+            // 
+            this.OTHCODE1.AutoSize = true;
+            this.OTHCODE1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OTHCODE1.Location = new System.Drawing.Point(117, 16);
+            this.OTHCODE1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OTHCODE1.Name = "OTHCODE1";
+            this.OTHCODE1.Power = null;
+            this.OTHCODE1.Size = new System.Drawing.Size(117, 25);
+            this.OTHCODE1.TabIndex = 7;
+            this.OTHCODE1.Text = "OTHCODE1";
+            this.OTHCODE1.UseVisualStyleBackColor = true;
+            // 
+            // OTHCODE2
+            // 
+            this.OTHCODE2.AutoSize = true;
+            this.OTHCODE2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OTHCODE2.Location = new System.Drawing.Point(117, 43);
+            this.OTHCODE2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OTHCODE2.Name = "OTHCODE2";
+            this.OTHCODE2.Power = null;
+            this.OTHCODE2.Size = new System.Drawing.Size(117, 25);
+            this.OTHCODE2.TabIndex = 8;
+            this.OTHCODE2.Text = "OTHCODE2";
+            this.OTHCODE2.UseVisualStyleBackColor = true;
+            // 
+            // OTHCODE3
+            // 
+            this.OTHCODE3.AutoSize = true;
+            this.OTHCODE3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OTHCODE3.Location = new System.Drawing.Point(117, 70);
+            this.OTHCODE3.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OTHCODE3.Name = "OTHCODE3";
+            this.OTHCODE3.Power = null;
+            this.OTHCODE3.Size = new System.Drawing.Size(117, 25);
+            this.OTHCODE3.TabIndex = 9;
+            this.OTHCODE3.Text = "OTHCODE3";
+            this.OTHCODE3.UseVisualStyleBackColor = true;
+            // 
+            // OTHID1
+            // 
+            this.OTHID1.AutoSize = true;
+            this.OTHID1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OTHID1.Location = new System.Drawing.Point(117, 97);
+            this.OTHID1.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OTHID1.Name = "OTHID1";
+            this.OTHID1.Power = null;
+            this.OTHID1.Size = new System.Drawing.Size(89, 25);
+            this.OTHID1.TabIndex = 10;
+            this.OTHID1.Text = "OTHID1";
+            this.OTHID1.UseVisualStyleBackColor = true;
+            // 
+            // OTHID2
+            // 
+            this.OTHID2.AutoSize = true;
+            this.OTHID2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OTHID2.Location = new System.Drawing.Point(117, 129);
+            this.OTHID2.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OTHID2.Name = "OTHID2";
+            this.OTHID2.Power = null;
+            this.OTHID2.Size = new System.Drawing.Size(89, 25);
+            this.OTHID2.TabIndex = 11;
+            this.OTHID2.Text = "OTHID2";
+            this.OTHID2.UseVisualStyleBackColor = true;
+            // 
+            // OTHID3
+            // 
+            this.OTHID3.AutoSize = true;
+            this.OTHID3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OTHID3.Location = new System.Drawing.Point(117, 156);
+            this.OTHID3.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.OTHID3.Name = "OTHID3";
+            this.OTHID3.Power = null;
+            this.OTHID3.Size = new System.Drawing.Size(89, 25);
+            this.OTHID3.TabIndex = 12;
+            this.OTHID3.Text = "OTHID3";
+            this.OTHID3.UseVisualStyleBackColor = true;
+            // 
             // Make_UpdateCollectCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -319,5 +424,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn psr_length;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
         private System.Windows.Forms.Label label3;
+        private CustomControl.CustomCheckBox.CustomCheckBox OTHID3;
+        private CustomControl.CustomCheckBox.CustomCheckBox OTHID2;
+        private CustomControl.CustomCheckBox.CustomCheckBox OTHID1;
+        private CustomControl.CustomCheckBox.CustomCheckBox OTHCODE3;
+        private CustomControl.CustomCheckBox.CustomCheckBox OTHCODE2;
+        private CustomControl.CustomCheckBox.CustomCheckBox OTHCODE1;
+        private CustomControl.CustomCheckBox.CustomCheckBox MEID;
     }
 }

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.cs

@@ -118,9 +118,9 @@ namespace UAS_MES.Make
                     }
                     sql.Clear();
                     sql.Append("select * from (select rownum rn, ms_prodcode,ms_makecode,ms_salecode,");
-                    sql.Append("ms_mac,ms_imei1,ms_bt,ms_netcode,ms_imei2,ms_imei3  from makeserial ");
+                    sql.Append("ms_mac,ms_imei1,ms_bt,ms_netcode,ms_imei2,ms_imei3,ms_othid1,ms_othid2,ms_othid3,ms_othcode1,ms_othcode2,ms_othcode3,ms_meid  from makeserial ");
                     sql.Append("where ms_firstsn=(select ms_firstsn from makeserial where ms_id='" + ms_id + "')");
-                    sql.Append(" and (nvl(ms_mac,' ')<>' ' or nvl(ms_bt,' ')<>' ' or nvl(ms_imei1,' ')<>' ' ) order by ms_id asc)where rn=1");
+                    sql.Append(" and (nvl(ms_mac,' ')<>' ' or nvl(ms_bt,' ')<>' ' or nvl(ms_imei1,' ')<>' ' or nvl(ms_othid1,' ')<>' ' or nvl(ms_othid2,' ')<>' ' or nvl(ms_othid3,' ')<>' ' or nvl(ms_othcode1,' ')<>' ' or nvl(ms_othcode2,' ')<>' ' or nvl(ms_othcode3,' ')<>' ' or nvl(ms_meid,' ')<>' ' ) order by ms_id asc)where rn=1");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     //无值则提示没有需要更新的信息
                     if (dt.Rows.Count == 0)
@@ -191,6 +191,14 @@ namespace UAS_MES.Make
                         case "IMEI1":
                         case "IMEI2":
                         case "IMEI3":
+                        case "OTHCODE1":
+                        case "OTHCODE2":
+                        case "OTHCODE3":
+                        case "OTHID1":
+                        case "OTHID2":
+                        case "OTHID3":
+                        case "MEID":
+
                             //验证长度前缀
                             if (!checkPrefixAndLength())
                             {

UAS-MES/FunctionCode/Make/Make_XrayTestCollection.cs

@@ -737,7 +737,7 @@ namespace UAS_MES.Make
                                 SQLS.Add("update makeserial set ms_status='2' where ms_id='" + ms_id + "'");
                         }
                     }
-                    SQLS.Add("update makebad set mb_status=-1,mb_enddate = sysdate where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and MB_STEPCODE = '" + User.CurrentStepCode + "'");
+                    SQLS.Add("update makebad set mb_status=-1 ,mb_enddate = sysdate where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and MB_STEPCODE = '" + User.CurrentStepCode + "'");
                     dh.ExecuteSQLTran(SQLS.ToArray());
                     //保存不良原因
                     LastSncode = ms_sncode.Text;

UAS-MES/Login.cs

@@ -108,7 +108,7 @@ namespace UAS_MES
             //设置选中数据库的链接
             string DBUser = DB.SelectedValue.ToString().Split('#')[0];
             string Address = DB.SelectedValue.ToString().Split('#')[1];
-            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST="+Address+")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.CurrentDB = DBUser;
             //设置屏幕的宽高信息
             SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;

UAS-MES/Properties/Settings.Designer.cs

@@ -110,8 +110,8 @@ namespace UAS_MES.Properties {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=fa" +
-            "lse;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.1" +
-            "80.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+            "lse;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168." +
+            "230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS-MES/Properties/Settings.settings

@@ -24,7 +24,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.230.200)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
       <Value Profile="(Default)">\\172.16.11.99\ShareTest</Value>

UAS-MES/PublicMethod/LogicHandler.cs

@@ -679,6 +679,75 @@ namespace UAS_MES.PublicMethod
             return (oErrMessage == "" || oErrMessage == null);
         }
 
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="iSNMakeCode">序列号的工单号</param>
+        /// <param name="iMakeCode">界面上的工单号</param>
+        /// <param name="ChangeMakeCodeNote">是否需要切换工单提醒</param>
+        /// <returns></returns>         
+        public static bool CheckDiffMakeCodeBeforeStepCheckSP(string iSN, string iMakeCode, bool iChangeMakeCodeNote, out string oMakeCode, out string oErrorMessage)
+        {
+            string oStatus = "";
+            GetMakeInfo(iSN, out oMakeCode, out oStatus, out oErrorMessage);
+            oErrorMessage = "";
+            bool NoteAlready = false;
+
+            //if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "" && oStatus != "2")
+            //{
+            //    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+            //    //如果选择不切换赋值当前界面工单
+            //    if (ChangeMakeCode != "Yes")
+            //    {
+            //        oErrorMessage = "请重新采集序列号";
+            //        NoteAlready = true;
+            //    }
+            //    else
+            //    {
+            //        NoteAlready = true;
+            //    }
+            //}
+            //else
+            //{
+            //    oMakeCode = iMakeCode;
+            //}
+            if (iMakeCode == "")
+            {
+                oErrorMessage = "录入工单号不可为空";
+            }
+            if (oMakeCode == "")
+            {
+                oErrorMessage = "SN:"+ iSN + "关联工单号为空";
+            }
+            if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "")
+            {
+                oErrorMessage = "SN:" + iSN + "关联工单号"+oMakeCode+"与界面工单"+iMakeCode+"不一致";
+            }
+
+            return (oErrorMessage == "" || oErrorMessage == null);
+        }
+
+        /// <summary>
+        /// 校验方法之后的检测
+        /// </summary>
+        /// <param name="iSNMakecode"></param>
+        /// <param name="iMakeCode"></param>
+        /// <param name="iChangeMakeCodeNote"></param>
+        /// <param name="NoteAlready"></param>
+        public static bool CheckDiffMakeCodeAfterStepCheckSP(string iSN, string iSNMakecode, bool iChangeMakeCodeNote, bool NoteAlready, Control ctl, out string oErrMessage)
+        {
+                oErrMessage = "";
+
+                if (iSNMakecode != ctl.Text && ctl.Text != "")
+                {
+                  oErrMessage = "序列号" + iSN + "所属工单不同,请重新采集序列号";
+                }
+            
+            return (oErrMessage == "" || oErrMessage == null);
+        }
+
         public static bool OQCBatchJudge(string iCheckno, string iSourceCode, string iResult, string iRework, string iUserCode, string iRemark, out string oReworkCode, out string oErrorMessage)
         {
             oReworkCode = "";

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.725</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.743</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>725</ApplicationRevision>
+    <ApplicationRevision>743</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -605,6 +605,12 @@
     <Compile Include="FunctionCode\Make\Make_SeqProgramTransform.Designer.cs">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_SmtbdTestCollection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_SmtbdTestCollection.Designer.cs">
+      <DependentUpon>Make_SmtbdTestCollection.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SMTStencil.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -629,12 +635,6 @@
     <Compile Include="FunctionCode\Make\Make_SpecialCartonPack.Designer.cs">
       <DependentUpon>Make_SpecialCartonPack.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_SmtbdTestCollection.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_SmtbdTestCollection.Designer.cs">
-      <DependentUpon>Make_SmtbdTestCollection.cs</DependentUpon>
-    </Compile>
     <Compile Include="FunctionCode\Make\Make_SpiTestCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1244,6 +1244,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SeqProgramTransform.resx">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_SmtbdTestCollection.resx">
+      <DependentUpon>Make_SmtbdTestCollection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SMTStencil.resx">
       <DependentUpon>Make_SMTStencil.cs</DependentUpon>
     </EmbeddedResource>
@@ -1256,9 +1259,6 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_SpecialCartonPack.resx">
       <DependentUpon>Make_SpecialCartonPack.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_SmtbdTestCollection.resx">
-      <DependentUpon>Make_SmtbdTestCollection.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SpiTestCollection.resx">
       <DependentUpon>Make_SpiTestCollection.cs</DependentUpon>
     </EmbeddedResource>