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

dkjsdfjlsld

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.Designer.cs

@@ -30,7 +30,13 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
+            this.SuspendLayout();
+            // 
+            // SnCollectionBox
+            // 
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SnCollectionBox_KeyDown);
+            this.ResumeLayout(false);
+
         }
 
       

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -32,5 +32,13 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                 base.Text = value;
             }
         }
+
+        private void SnCollectionBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                this.SelectAll();
+            }
+        }
     }
 }

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

@@ -233,7 +233,7 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(911, 56);
+            this.ma_softversion.Location = new System.Drawing.Point(907, 68);
             this.ma_softversion.Name = "ma_softversion";
             this.ma_softversion.Size = new System.Drawing.Size(0, 31);
             this.ma_softversion.TabIndex = 150;
@@ -285,9 +285,8 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(543, 26);
+            this.ma_prodcode.Location = new System.Drawing.Point(550, 26);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 24;
@@ -297,7 +296,7 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(911, 14);
+            this.pr_detail.Location = new System.Drawing.Point(906, 26);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail.MaximumSize = new System.Drawing.Size(164, 0);
             this.pr_detail.Name = "pr_detail";

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

@@ -301,7 +301,6 @@
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.ma_prodcode.Location = new System.Drawing.Point(576, 26);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 94;

UAS_AutoPass/AutoAnalysisXml.cs

@@ -262,6 +262,7 @@ namespace UAS_AutoPass
                 else
                 {
                     OperateResult.AppendText("当前线别在" + istepcode + "无可分配序列号");
+                    tipform.startthread("当前线别在" + istepcode + "无可分配序列号", "NG");
                     return;
                 }
                 //-2-NG2017/10/2514:46:29.xml取第二位版号
@@ -278,12 +279,14 @@ namespace UAS_AutoPass
                     if (!LogicHandler.SetStepResult(makecode, isource, sncode, "自动过站采集", "OK", iusercode, out oErrMessage))
                     {
                         OperateResult.AppendText(oErrMessage + "\n");
+                        tipform.startthread(oErrMessage, "NG");
                         return;
                     }
                 }
                 else
                 {
                     OperateResult.AppendText(oErrMessage + "\n");
+                    tipform.startthread(oErrMessage, "NG");
                     return;
                 }
             }
@@ -321,6 +324,7 @@ namespace UAS_AutoPass
                             else
                             {
                                 OperateResult.AppendText(">>请重新采集序列号\n");
+                                tipform.startthread("请重新采集序列号", test_result);
                                 return;
                             }
                         }
@@ -362,6 +366,7 @@ namespace UAS_AutoPass
                 else
                 {
                     OperateResult.AppendText(oErrMessage + "\n");
+                    tipform.startthread(oErrMessage, "NG");
                     return;
                 }
             }
@@ -544,7 +549,7 @@ namespace UAS_AutoPass
                 {
                     //获取资源,线别,工序相等，并且状态在线的序列号进行分配
                     sql.Clear();
-                    sql.Append("select ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
+                    sql.Append("selecip ms_sncode,ms_makecode from makeserial left join source on sc_code=ms_sccode where ");
                     sql.Append("ms_linecode='" + ilinecode + "' and ms_nextstepcode='" + istepcode + "' and ms_status=1 order by ms_id");
                     dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (dt.Rows.Count > 0)

UAS_AutoPass/Form2.Designer.cs

@@ -37,20 +37,23 @@
             this.label1.BackColor = System.Drawing.SystemColors.Menu;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(75, 18);
+            this.label1.Location = new System.Drawing.Point(37, 22);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.MaximumSize = new System.Drawing.Size(360, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(0, 21);
+            this.label1.Size = new System.Drawing.Size(0, 27);
             this.label1.TabIndex = 0;
             // 
             // Tip
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Menu;
-            this.ClientSize = new System.Drawing.Size(312, 59);
+            this.ClientSize = new System.Drawing.Size(416, 98);
             this.Controls.Add(this.label1);
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Tip";
             this.Text = "Form2";
             this.TopMost = true;