Ver Fonte

修改机械手读取

ltwork há 1 ano atrás
pai
commit
ed829f5f60

+ 1 - 1
BlankApp1/BlankApp1/App.config

@@ -3,7 +3,7 @@
 	<appSettings>
 		<!--连接字符串 SQL Server-->
 		<add key="MySql" value="Data Source=localhost;Database=plc_point_db;User Id='root';Password='521125';port=3306;charset=utf8mb4;"/>
-		<add key="PLCIp" value="192.168.250.1"/>
+		<add key="PLCIp" value="192.168.0.20"/>
 		<add key="PLCPort" value="9600"/>
 
 	</appSettings>

+ 23 - 19
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -955,21 +955,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private async Task ReadJudge(String strLogic)
         {
             int countCond = 0;
-            DateTime entryTime = DateTime.Now;
-            await Task.Run(async () =>
-            {
-                while (entryTime.AddMilliseconds(delayTime * 1000) > DateTime.Now)
-                {
-                    //显示进度条
-                    System.Windows.Application.Current.Dispatcher.Invoke((delegate
-                    {
-                        ProVisibility = Visibility.Visible;
-                    }));
-
-                    await Task.Delay(1000);
-                }
-            });
-            ProVisibility = Visibility.Hidden;
+          
             foreach (var item in OutConList.OrderBy(x => x.Id))
             {
                 string plcAddress = item.PlcAddress;
@@ -983,8 +969,26 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                       
                         string readResult = string.Empty;
                         //
-                  
-                        readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
+                        DateTime entryTime = DateTime.Now;
+                        await Task.Run(async () =>
+                        {
+                            while (entryTime.AddMilliseconds(delayTime * 1000) > DateTime.Now)
+                            {
+                                //显示进度条
+                                System.Windows.Application.Current.Dispatcher.Invoke((delegate
+                                {
+                                    ProVisibility = Visibility.Visible;
+                                }));
+                                readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
+                                if (readResult == item.PlcValue)
+                                {
+                                    break;
+                                }
+                                await Task.Delay(1000);
+                            }
+                        });
+                        ProVisibility = Visibility.Hidden;
+                      
                       
                         ///实时值记录
                         item.RealValue = readResult;
@@ -1014,8 +1018,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                     ProVisibility = Visibility.Visible;
                                 }));
 
-                                readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Word);
-                                if (readResult == item.PlcValue)
+                                readResult2 = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Word);
+                                if (readResult2 == item.PlcValue)
                                 {
                                     break;
                                 }

+ 2 - 2
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -1009,8 +1009,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                     ProVisibility = Visibility.Visible;
                                 }));
 
-                                readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Word);
-                                if (readResult == item.PlcValue)
+                                readResult2 = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Word);
+                                if (readResult2 == item.PlcValue)
                                 {
                                     break;
                                 }

+ 1 - 1
BlankApp1/BlankApp1/Views/BusinessManageView/QueryView.xaml

@@ -51,7 +51,7 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="创建时间:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" Height="25" Width="160" SelectedDateTime="{Binding StartTime}" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="至:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>