diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs
index ed8db19..7bdf2c8 100644
--- a/PaintingPC/FrmQuality.cs
+++ b/PaintingPC/FrmQuality.cs
@@ -73,7 +73,10 @@ namespace PaintingPC
 
                 if(_stations.Contains(_stationNo) == false)
                 {
-
+                    MessageBox.Show("产线[" + _lineCodeSys + "]与当前配置的工位[" + _stationNo + "]不匹配,当前查询包含工位有["+string.Join(",", _stations) +"],请先核对配置.");
+                    this.Close();
+                    return;
+                    //ShowHint("产线[" + _lineCodeSys + "]与当前配置的工位["+ _stationNo + "]不匹配,请先核对配置.", false);
                 }
 
             }
@@ -165,12 +168,12 @@ namespace PaintingPC
             {
                 string title = ConfigurationManager.AppSettings["Display"].ToString(); ;
                 string workClass = Function.GetWorkClass2();
-                string station = ConfigurationManager.AppSettings["Station"].ToString();
+                //string station = ConfigurationManager.AppSettings["Station"].ToString();
 
                 labTitle.Text = title;
 
                 labWorkClass.Text = workClass;
-                labStation.Text = station;
+                labStation.Text = _stationNo;
                 labelVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
 
                 Program.IP = ConfigurationManager.AppSettings["IP"].ToString();
@@ -1280,7 +1283,7 @@ namespace PaintingPC
                 {
                     int drow = 0, dcol = 5; //行，列
 
-                    DataTable dt3 = Function.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim());
+                    DataTable dt3 = Function.SearchDefectInfo(_stationNo);
                     if (dt3 != null && dt3.Rows.Count > 0)
                     {
                         //if(_stationType != "下线点修补")