数量转换出错修改

DeviceLibrary/csvLoad/CSVBomManager.cs

@@ -845,8 +845,8 @@ namespace TSA_V.LoadCSVLibrary
                     List<ComponetInfo> list = (from m in useComponets where m.Id.Equals(obj.Id) select m).ToList(); 
                     if (list.Count > 0)
                     {
-                        obj.ComCount = (int.Parse(obj.ComCount) - list.Count).ToString();
-                        if (int.Parse(obj.ComCount) < 0)
+                        obj.ComCount = (obj.GetCount() - list.Count).ToString();
+                        if (obj.GetCount() < 0)
                         {
                             obj.ComCount = "0";
                         }

DeviceLibrary/csvLoad/position/ComponetInfo.cs

@@ -158,5 +158,16 @@ namespace TSA_V.LoadCSVLibrary
         {
             return $"ID:{Id},Pn:{PN},TagNo:{TagNo},X:{PositionX},Y:{PositionY},Des:{ComponentDes},Count:{ComCount},PositionNum:{PositionNum}";
         }
+       public int GetCount()
+        {
+            try
+            {
+                return int.Parse(this.ComCount);
+            }catch(Exception ex)
+            {
+                LogUtil.error(ex.ToString());
+            }
+            return 0;
+        }
     }
 }

DeviceLibrary/deviceLibrary/ledLabel/LedLabelController.cs

@@ -57,7 +57,7 @@ namespace TSA_V.DeviceLibrary
             }
             LabelInfo label = new LabelInfo(position.PositionNum, com.ComCount, com.PN, com.ComponentDes, com.Notes, position.DeviceIP, position.Leds, opendLed);
              
-            if (int.Parse(com.ComCount) <= 0)
+            if (com.GetCount() <= 0)
             {
                 label.notes = ResourceControl.GetString("元器件数量不足", "元器件数量不足");
             }

DeviceLibrary/manager/work/TSAVBean.cs

@@ -151,6 +151,12 @@ namespace TSA_V.DeviceLibrary
         public static string startRunMsg = "";
         public static string StartRun()
         {
+
+            if (Setting_NInit.Device_SoftMode)
+            {
+                ToRunning("简洁模式，无硬件需要复位");
+            }
+
             if (!IOManager.ShuddenOK())
             {
                 WarnMsg = GetTime() + ResourceControl.GetString("FrmBoardInfo_lblMsg_Text", "急停未开");
@@ -1019,39 +1025,47 @@ namespace TSA_V.DeviceLibrary
         public static string GetShowMsg()
         {
             string ShowMsg = "";
-            if (TSAVBean.IsInSuddenDown)
-            {
-                ShowMsg = ResourceControl.GetString(ResourceControl.DeviceInSuddenStop, "设备急停中");
-            } else if (TSAVBean.NoAirAlarm)
-            {
-                ShowMsg = ResourceControl.GetString(ResourceControl.NoAirAlarm, "未检测到气压信号");
-            }
-            else if (TSAVBean.Status.Equals(TSAVStatus.Wait))
-            {
-                ShowMsg = ResourceControl.GetString(ResourceControl.DeviceNotStart, "设备未启动") + " " + startRunMsg;
-            }
-            else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
+            if (Setting_NInit.Device_SoftMode)
             {
-                ShowMsg = ResourceControl.GetString(ResourceControl.DeviceInGohome, "设备正在原点返回中");
+
             }
-            else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
+            else
             {
-                string msg = ResourceControl.GetString(ResourceControl.DeviceInWork, "设备工作中");
-                string lineMsg = ResourceControl.GetString(ResourceControl.LineTurn, "流水线转动中");
-                if (TSAVBean.Work.IsWorking)
+                if (TSAVBean.IsInSuddenDown)
                 {
-                    TimeSpan span = DateTime.Now - TSAVBean.Work.beginWorkTime;
-                    int count = TSAVBean.Work.BoardCount;
-                    string time = span.Hours.ToString().PadLeft(2, '0') + ":" + span.Minutes.ToString().PadLeft(2, '0') + ":" + span.Seconds.ToString().PadLeft(2, '0');
-                    ShowMsg = ResourceControl.GetString(ResourceControl.WorkInfoMsg, "已工作{0},{1}块电路板", time, count) + "\r\n" + TSAVBean.WarnMsg;
+                    ShowMsg = ResourceControl.GetString(ResourceControl.DeviceInSuddenStop, "设备急停中");
                 }
-                else if (TSAVBean.LineStep.moveType.Equals(1))
+                else if (TSAVBean.NoAirAlarm)
                 {
-                    ShowMsg = lineMsg + "\r\n" + TSAVBean.WarnMsg;
+                    ShowMsg = ResourceControl.GetString(ResourceControl.NoAirAlarm, "未检测到气压信号");
                 }
-                else
+                else if (TSAVBean.Status.Equals(TSAVStatus.Wait))
                 {
-                    ShowMsg = msg + "\r\n" + TSAVBean.WarnMsg;
+                    ShowMsg = ResourceControl.GetString(ResourceControl.DeviceNotStart, "设备未启动") + " " + startRunMsg;
+                }
+                else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
+                {
+                    ShowMsg = ResourceControl.GetString(ResourceControl.DeviceInGohome, "设备正在原点返回中");
+                }
+                else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
+                {
+                    string msg = ResourceControl.GetString(ResourceControl.DeviceInWork, "设备工作中");
+                    string lineMsg = ResourceControl.GetString(ResourceControl.LineTurn, "流水线转动中");
+                    if (TSAVBean.Work.IsWorking)
+                    {
+                        TimeSpan span = DateTime.Now - TSAVBean.Work.beginWorkTime;
+                        int count = TSAVBean.Work.BoardCount;
+                        string time = span.Hours.ToString().PadLeft(2, '0') + ":" + span.Minutes.ToString().PadLeft(2, '0') + ":" + span.Seconds.ToString().PadLeft(2, '0');
+                        ShowMsg = ResourceControl.GetString(ResourceControl.WorkInfoMsg, "已工作{0},{1}块电路板", time, count) + "\r\n" + TSAVBean.WarnMsg;
+                    }
+                    else if (TSAVBean.LineStep.moveType.Equals(1))
+                    {
+                        ShowMsg = lineMsg + "\r\n" + TSAVBean.WarnMsg;
+                    }
+                    else
+                    {
+                        ShowMsg = msg + "\r\n" + TSAVBean.WarnMsg;
+                    }
                 }
             }
             return ShowMsg;

TSA-V/FrmComponentList.cs

@@ -174,7 +174,7 @@ namespace TSA_V
                         return;
                     }
 
-                    if (int.Parse(obj.ComCount) <= 0)
+                    if (obj.GetCount() <= 0)
                     {
                         MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComNum, "请输入元器件数量！"));
                         txtCount.Focus();
@@ -259,7 +259,7 @@ namespace TSA_V
                 return;
             }
 
-            if (int.Parse(obj.ComCount) <= 0)
+            if (obj.GetCount() <= 0)
             {
                 MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComNum, "请输入元器件数量！"));
                 txtCount.Focus();

TSA-V/workForm/FrmTSAV.cs

@@ -654,7 +654,7 @@ namespace TSA_V
                     lblCount.Text = com.ComCount.ToString();
                     txtCount.Text = com.ComCount.ToString();
                     lblComNotices.Text = com.Notes.ToString();
-                    if (int.Parse(com.ComCount) <= 0)
+                    if (com.GetCount() <= 0)
                     {
                         lblComNotices.Text = ResourceCulture.GetString("元器件数量不足，请及时补充", "元器件数量不足，请及时补充");
                     }