备料bug修改

TSA-V/FrmBoardList.cs

@@ -386,18 +386,18 @@ namespace TSA_V
             {
             {
                 BoardInfo board = (BoardInfo)cmbBoardList.SelectedItem;
                 BoardInfo board = (BoardInfo)cmbBoardList.SelectedItem;
                 List<ComponetInfo> allList = CSVBomManager.GetComList(board.bomName); 
                 List<ComponetInfo> allList = CSVBomManager.GetComList(board.bomName); 
-                List<SMTPointInfo> plist = (from m in board.smtList where m.Disable.Equals(0) select m).ToList();
+                List<SMTPointInfo> plist = (from m in board.smtList where m.Disable.Equals(false) select m).ToList();
                 List<ComponetInfo> list = new List<ComponetInfo>();
                 List<ComponetInfo> list = new List<ComponetInfo>();
                 foreach (ComponetInfo p in allList)
                 foreach (ComponetInfo p in allList)
                 {
                 {
                     List<SMTPointInfo> hasList = new List<SMTPointInfo>();
                     List<SMTPointInfo> hasList = new List<SMTPointInfo>();
                     if (String.IsNullOrEmpty(p.TagNo))
                     if (String.IsNullOrEmpty(p.TagNo))
                     {
                     {
-                        hasList = (from m in board.smtList where m.PN.Equals(p.PN) select m).ToList();
+                        hasList = (from m in plist where m.PN.Equals(p.PN) select m).ToList();
                     }
                     }
                     else
                     else
                     {
                     {
-                        hasList = (from m in board.smtList where m.TagNo.Equals(p.TagNo) select m).ToList();
+                        hasList = (from m in plist where m.TagNo.Equals(p.TagNo) select m).ToList();
                     }
                     }
                      
                      
                     if (hasList.Count > 0)
                     if (hasList.Count > 0)

TSA-V/FrmBoardPutCom.cs

@@ -69,16 +69,16 @@ namespace TSA_V
             }
             }
             currIndex = 0;
             currIndex = 0;
             ShowCom();
             ShowCom();
-            //if (TSAVBean.Status <= TSAVStatus.Wait)
-            //{
-            //    MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DeviceNotOk,"设备未连接，无法备料！"));
-            // return false ;
-            //}
-            //else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
-            //{
-            //    MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DeviceInReset,"设备正在重置中，请稍后再备料！"));
-            //    return false;
-            //}
+            if (TSAVBean.Status <= TSAVStatus.Wait)
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DeviceNotOk, "设备未连接，无法备料！"));
+                return false;
+            }
+            else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DeviceInReset, "设备正在重置中，请稍后再备料！"));
+                return false;
+            }
             return true;
             return true;
         }
         }