change - 任务列表逻辑

Aucma.Scada.Business/TaskInfoBusiness.cs

@@ -40,7 +40,7 @@ namespace Aucma.Scada.Business
         /// <returns></returns>
         public List<RealTaskInfo> GetTaskInfos(int taskType)
         {
-             return taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, taskType);
+             return taskInfoService.GetTaskInfosByTaskStatus(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, taskType,0);
         }
     }
 }

Aucma.Scada.UI/Aucma.Scada.UI.csproj

@@ -95,6 +95,7 @@
     <Compile Include="Converter\LinerInventory\StatusLabelConverter.cs" />
     <Compile Include="Converter\ShellInventory\StatusLabelConverter.cs" />
     <Compile Include="Converter\TaskInfo\TaskStatusConverter.cs" />
+    <Compile Include="Converter\TaskInfo\TaskTypeConverter.cs" />
     <Compile Include="Page\AssemblyPlan\AssemblyPlanControl.xaml.cs">
       <DependentUpon>AssemblyPlanControl.xaml</DependentUpon>
     </Compile>

Aucma.Scada.UI/Converter/TaskInfo/TaskTypeConverter.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Aucma.Scada.UI.Converter.TaskInfo
+{
+    public class TaskTypeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return false;
+            }
+            else
+            {
+                int info = (int)value;
+                string result = "";
+                switch (info)
+                {
+                    case 1:
+                        result = "入库任务";
+                        break;
+                    case 2:
+                        result = "出库任务";
+                        break;
+                    default:
+                        break;
+                }
+                return result;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml

@@ -170,7 +170,8 @@
                         <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="出库状态" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="任务时间" Width="*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm:ss\}}" Header="开始时间" Width="*" IsReadOnly="True"/>
                         <DataGridTemplateColumn Header="操作" Width="*">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>

Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml

@@ -4,8 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
+             xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
              mc:Ignorable="d" 
              d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
+    <Control.Resources>
+        <local1:TaskStatusConverter x:Key="TaskStatusConverter" />
+        <local1:TaskTypeConverter x:Key="TaskTypeConverter"/>
+    </Control.Resources>
     <Grid Margin="5,5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -33,13 +38,15 @@
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
                             <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding taslType}" Header="任务类型" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskType,Converter={StaticResource TaskTypeConverter}}" Header="任务类型" Width="*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding materialType}" Header="物料型号" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding storeCode}" Header="仓库" Width="*" IsReadOnly="True"/>
                             <DataGridTextColumn Binding="{Binding spaceName}" Header="货道" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding beginTime}" Header="执行时间" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding taskStatus}" Header="状态" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="执行时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="状态" Width="*" IsReadOnly="True"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Border>
@@ -53,16 +60,17 @@
                      Foreground="Gray" >
                         <!--resourceStyle 399行修改选中字体颜色-->
                         <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="*"  IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="任务编号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="任务类型" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="计划编号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="物料编码" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="物料型号" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="物料条码" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="货道" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="执行时间" Width="*" IsReadOnly="True"/>
-                            <DataGridTextColumn Binding="{Binding userName}" Header="完成时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskCode}" Header="任务编号" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskType,Converter={StaticResource TaskTypeConverter}}" Header="任务类型" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding planCode}" Header="计划编号" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding materialType}" Header="物料型号" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding storeCode}" Header="仓库" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding spaceName}" Header="货道" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:yyyy-MM-dd HH:mm:ss\}}" Header="创建时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding beginTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="开始时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding endTime,StringFormat=\{0:MM-dd HH:mm\}}" Header="结束时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="状态" Width="*" IsReadOnly="True"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Border>

Aucma.Scada.UI/bin/Debug/Log/2023-10-09/LogInfo.txt

@@ -1942,4 +1942,184 @@
 日志时间：2023-10-09 15:16:32,167 [1] 
 日志级别：INFO  
 日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:17:54,366 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:18:29,134 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:19:56,027 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:20:06,461 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:24:30,173 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:26:05,908 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:28:38,491 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:30:52,755 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:32:21,510 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:32:50,112 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:36:28,025 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:36:41,108 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:37:47,310 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:38:14,459 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:39:31,644 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:39:42,356 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:40:16,246 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:40:22,743 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:40:56,261 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:41:19,565 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:42:39,442 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:42:55,274 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 15:44:01,298 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:44:32,184 [1] 
+日志级别：INFO  
+日志内容：根据执行计划编号6710fdca78e7422d9257c9555a2b41ac；获取到的执行计划信息：{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":2,"createdTime":"\/Date(1696831431000)\/"} 
+ <-------------->
+日志时间：2023-10-09 15:44:32,234 [1] 
+日志级别：INFO  
+日志内容：根据执行计划编号a1840ce98f5b45c6b42ef6bcccf4395f；获取到的执行计划信息：{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696834124000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":1,"createdTime":"\/Date(1696831536000)\/"} 
+ <-------------->
+日志时间：2023-10-09 15:44:32,471 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696837472000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":2,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 15:44:32,849 [4] 
+日志级别：INFO  
+日志内容：收到出库计划，物料码：3504000161 
+ <-------------->
+日志时间：2023-10-09 15:44:32,923 [4] 
+日志级别：INFO  
+日志内容：根据仓库XKJCK-001；物料：3504000161；获取到的货道信息：[{"objId":1,"spaceCode":"XK_001","spaceName":"货道01","spaceCapacity":10,"spaceStock":10,"spaceStatus":1,"spaceType":1,"materialType":"3504000161","storeCode":"XKJCK-001","isFlag":0,"onRouteAmount":0}] 
+ <-------------->
+日志时间：2023-10-09 15:44:32,926 [4] 
+日志级别：INFO  
+日志内容：仓库XKJCK-001；物料：3504000161；匹配的入库货道信息：{"objId":1,"spaceCode":"XK_001","spaceName":"货道01","spaceCapacity":10,"spaceStock":10,"spaceStatus":1,"spaceType":1,"materialType":"3504000161","storeCode":"XKJCK-001","isFlag":0,"onRouteAmount":0} 
+ <-------------->
+日志时间：2023-10-09 15:44:32,926 [4] 
+日志级别：INFO  
+日志内容：匹配货道：货道01 
+ <-------------->
+日志时间：2023-10-09 15:44:33,126 [4] 
+日志级别：INFO  
+日志内容：出库任务创建成功 
+ <-------------->
+日志时间：2023-10-09 15:44:33,644 [4] 
+日志级别：INFO  
+日志内容：收到出库计划，物料码：3600000780 
+ <-------------->
+日志时间：2023-10-09 15:44:33,756 [4] 
+日志级别：INFO  
+日志内容：根据仓库NDJCK-001；物料：3600000780；获取到的货道信息：[{"objId":3,"spaceCode":"ND_001","spaceName":"货道01","spaceCapacity":10,"spaceStock":10,"spaceStatus":1,"spaceType":1,"materialType":"3600000780","storeCode":"NDJCK-001","isFlag":0,"onRouteAmount":0}] 
+ <-------------->
+日志时间：2023-10-09 15:44:33,756 [4] 
+日志级别：INFO  
+日志内容：仓库NDJCK-001；物料：3600000780；匹配的入库货道信息：{"objId":3,"spaceCode":"ND_001","spaceName":"货道01","spaceCapacity":10,"spaceStock":10,"spaceStatus":1,"spaceType":1,"materialType":"3600000780","storeCode":"NDJCK-001","isFlag":0,"onRouteAmount":0} 
+ <-------------->
+日志时间：2023-10-09 15:44:33,756 [4] 
+日志级别：INFO  
+日志内容：匹配货道：货道01 
+ <-------------->
+日志时间：2023-10-09 15:44:33,866 [4] 
+日志级别：INFO  
+日志内容：出库任务创建成功 
+ <-------------->
+日志时间：2023-10-09 15:45:42,900 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 16:09:11,700 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696837472000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":2,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 16:10:02,742 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 16:11:03,551 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696837472000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":2,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 16:14:00,432 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696837472000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":2,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 16:17:53,128 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696837472000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":2,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 16:19:00,814 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-10-09 16:20:05,998 [1] 
+日志级别：INFO  
+日志内容：根据产线工位编号：ZZ-01；获取到的执行计划信息：[{"objId":64,"executePlanCode":"6710fdca78e7422d9257c9555a2b41ac","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696835269000)\/","endTime":null,"isFlag":0,"executeOrder":1,"executeStatus":1,"createdTime":"\/Date(1696831431000)\/"},{"objId":65,"executePlanCode":"a1840ce98f5b45c6b42ef6bcccf4395f","productPlanCode":"202310081458","orderCode":"11215483","materialCode":"9002006859","materialName":"SC-439,YZXGWBC元气森林,C","productLineCode":"ZZ-01","planAmount":1,"completeAmount":0,"beginTime":"\/Date(1696837472000)\/","endTime":null,"isFlag":0,"executeOrder":0,"executeStatus":2,"createdTime":"\/Date(1696831536000)\/"}] 
+ <-------------->
+日志时间：2023-10-09 16:20:18,991 [1] 
+日志级别：INFO  
+日志内容：程序退出 
  

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6d8c9680f6c285ca6dae8eef53d1764327994fd2
+8c62282e566233f3d1ec0b8c9430f0155780137f

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache

@@ -12,7 +12,7 @@ DEBUG;TRACE
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
 13-444325909
 
-311355729353
+321021156326
 1341517938856
 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache

@@ -12,7 +12,7 @@ DEBUG;TRACE
 C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
 13-444325909
 
-32601159569
+33266586542
 1341517938856
 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 

Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EC447A4FD95887F47EBA0FEE1DAEC7F84ECFD2CC6AAE2C000652D0173BFAE851"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C5334908BC685EB41E80463B44FC34AA45EBA1BCDF54EBF6AEE317A996E0846C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EC447A4FD95887F47EBA0FEE1DAEC7F84ECFD2CC6AAE2C000652D0173BFAE851"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C5334908BC685EB41E80463B44FC34AA45EBA1BCDF54EBF6AEE317A996E0846C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "51CDF8A469AB69CE4DB7E52A9708C0AD79F1AB4758863636AE5C4772ED04EF94"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "097BADF71625FDAC4AC578C441B5AD8F90E7BAF0B1CF5582C87D447BBDE5F135"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -9,6 +9,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using Aucma.Scada.UI.Converter.TaskInfo;
 using Aucma.Scada.UI.Page.TaskInfo;
 using System;
 using System.Diagnostics;
@@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
     public partial class TaskInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 15 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 20 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button inStore;
         
@@ -49,7 +50,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
         #line hidden
         
         
-        #line 16 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 21 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button outStore;
         

Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "51CDF8A469AB69CE4DB7E52A9708C0AD79F1AB4758863636AE5C4772ED04EF94"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "097BADF71625FDAC4AC578C441B5AD8F90E7BAF0B1CF5582C87D447BBDE5F135"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -9,6 +9,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using Aucma.Scada.UI.Converter.TaskInfo;
 using Aucma.Scada.UI.Page.TaskInfo;
 using System;
 using System.Diagnostics;
@@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
     public partial class TaskInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 15 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 20 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button inStore;
         
@@ -49,7 +50,7 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
         #line hidden
         
         
-        #line 16 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        #line 21 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button outStore;
         

Aucma.Scada.UI/viewModel/TaskInfo/TaskInfoViewModel.cs

@@ -15,15 +15,13 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo
 {
     public class TaskInfoViewModel : ViewModelBase
     {
-        private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl();
-
         private TaskInfoBusiness taskInfoBusiness = TaskInfoBusiness.Instance;
 
         public TaskInfoViewModel()
         {
             TaskCommand = new RelayCommand<object>(obj => Task(obj));
 
-            this.OutStoreTask();
+            this.InStoreTask();
         }
 
         #region 参数定义
@@ -42,9 +40,9 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo
         /// <summary>
         /// 记录列表DataGrid
         /// </summary>
-        private ObservableCollection<SysUserInfo> recordInfoDataGrid;
+        private ObservableCollection<RealTaskInfo> recordInfoDataGrid;
 
-        public ObservableCollection<SysUserInfo> RecordInfoDataGrid
+        public ObservableCollection<RealTaskInfo> RecordInfoDataGrid
         {
             get { return recordInfoDataGrid; }
             set { recordInfoDataGrid = value; RaisePropertyChanged(() => RecordInfoDataGrid); }
@@ -85,14 +83,21 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo
             var models = taskInfoBusiness.GetTaskInfos(1);
 
             TaskInfoDataGrid = new ObservableCollection<RealTaskInfo>();
-            //RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            RecordInfoDataGrid = new ObservableCollection<RealTaskInfo>();
             if (models != null)
             {
                 models.ForEach(
                 arg =>
                 {
-                    TaskInfoDataGrid.Add(arg);
-                    //RecordInfoDataGrid.Add(arg);
+                    
+                    if(arg.taskStatus == 3)
+                    {
+                        RecordInfoDataGrid.Add(arg);
+                    }
+                    else
+                    {
+                        TaskInfoDataGrid.Add(arg);
+                    }
                 });
             }
         }
@@ -106,14 +111,21 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo
             var models = taskInfoBusiness.GetTaskInfos(2);
 
             TaskInfoDataGrid = new ObservableCollection<RealTaskInfo>();
-            //RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            RecordInfoDataGrid = new ObservableCollection<RealTaskInfo>();
             if (models != null)
             {
                 models.ForEach(
                 arg =>
                 {
-                    TaskInfoDataGrid.Add(arg);
-                    //RecordInfoDataGrid.Add(arg);
+
+                    if (arg.taskStatus == 3)
+                    {
+                        RecordInfoDataGrid.Add(arg);
+                    }
+                    else
+                    {
+                        TaskInfoDataGrid.Add(arg);
+                    }
                 });
             }
         }

HighWayIot.Repository/service/IRealTaskInfoService.cs

@@ -59,5 +59,14 @@ namespace HighWayIot.Repository.service
         /// <returns></returns>
         List<RealTaskInfo> GetTaskInfosByStoreCode(string[] storeCode,int taskType);
 
+        /// <summary>
+        /// 获取指定状态的任务列表
+        /// </summary>
+        /// <param name="storeCode"></param>
+        /// <param name="taskType"></param>
+        /// <param name="taskStatus">0返回所有状态；1-待执行；2-执行中；3-已完成</param>
+        /// <returns></returns>
+        List<RealTaskInfo> GetTaskInfosByTaskStatus(string[] storeCode, int taskType, int taskStatus);
+        
     }
 }

HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs

@@ -151,7 +151,10 @@ namespace HighWayIot.Repository.service.Impl
             List<RealTaskInfo> taskInfos = null;
             try
             {
-                taskInfos = _mesRepository.GetList(x => storeCode.Contains(x.storeCode) && x.taskType == x.taskType && x.taskStatus != 3 );
+                Expression<Func<RealTaskInfo, bool>> exp = s1 => true;
+                exp = exp.And(x => x.taskType == taskType && x.taskStatus != 3 && storeCode.Contains(x.storeCode));
+                
+                taskInfos = _mesRepository.GetList(exp);
             }
             catch (Exception ex)
             {
@@ -160,5 +163,31 @@ namespace HighWayIot.Repository.service.Impl
             return taskInfos;
         }
 
+        /// <summary>
+        /// 获取指定状态的任务列表,如果为0返回所有状态
+        /// </summary>
+        /// <param name="storeCode"></param>
+        /// <param name="taskType"></param>
+        /// <param name="taskStatus"></param>
+        /// <returns></returns>
+        public List<RealTaskInfo> GetTaskInfosByTaskStatus(string[] storeCode,int taskType, int taskStatus)
+        {
+            List<RealTaskInfo> taskInfos = null;
+            try
+            {
+                Expression<Func<RealTaskInfo, bool>> exp = s1 => true;
+                exp = exp.And(x => x.taskType == taskType && storeCode.Contains(x.storeCode)) ;
+                if(taskStatus != 0)
+                {
+                    exp = exp.And(x => x.taskStatus == taskStatus);
+                }
+                taskInfos = _mesRepository.GetList(exp);
+            }
+            catch (Exception ex)
+            {
+                logHelper.Error("获取指定状态的任务信息异常", ex);
+            }
+            return taskInfos;
+        }
     }
 }