提示调整

UAS_AutoPass/AutoAnalysisXml.cs

@@ -278,12 +278,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;
                 }
             }
@@ -362,6 +364,7 @@ namespace UAS_AutoPass
                 else
                 {
                     OperateResult.AppendText(oErrMessage + "\n");
+                    tipform.startthread(oErrMessage, "NG");
                     return;
                 }
             }
@@ -544,7 +547,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;