change - 组装任务下达处理

Aucma.Scada.Business/AssemblyPlanBusiness.cs

@@ -122,7 +122,7 @@ namespace Aucma.Scada.Business
                     executePlanInfo.executeOrder = _executePlanInfoService.GetExecuteOrderByProductLineCode(appConfig.stationCode);
                     executePlanInfo.executeStatus = 1;
                     executePlanInfo.planAmount = transmitAmount;
-                    executePlanInfo.beginTime = DateTime.Now;
+                    executePlanInfo.createdTime = DateTime.Now;
                     result = _executePlanInfoService.InsertExecutePlanInfo(executePlanInfo);
 
                     if (result)
@@ -213,15 +213,53 @@ namespace Aucma.Scada.Business
         /// 下传计划
         /// </summary>
         /// <param name="planCode"></param>
-        public void ExecutePlanInfo_NextPass(string planCode)
+        public ExecutePlanInfo ExecutePlanInfo_NextPass(string planCode,string nowPlanCode)
         {
-            //获取执行计划
-            ExecutePlanInfo planInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(planCode);
-            if (planInfo != null)
+            ExecutePlanInfo planInfo = null;
+            try
+            {
+                List<ExecutePlanInfo> planInfos = new List<ExecutePlanInfo>();
+                if (!string.IsNullOrEmpty(nowPlanCode))
+                {
+                    ExecutePlanInfo nowPlanInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(nowPlanCode);
+                    if(nowPlanInfo != null)
+                    {
+                        nowPlanInfo.executeStatus = 1;
+                        planInfos.Add(nowPlanInfo);
+                    }
+                }
+
+                //获取执行计划
+                planInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(planCode);
+                if (planInfo != null)
+                {
+                    //传给出库
+                    NextPassExecutePlanInfoEvent?.Invoke(planInfo);
+
+                    planInfo.executeStatus = 2;
+                    planInfo.beginTime = DateTime.Now;
+                    planInfos.Add(planInfo);
+                }
+                else
+                {
+                    logHelper.Info($"执行计划下传失败,执行计划编号：{planCode}未获取到执行计划");
+                    return planInfo;
+                }
+
+                if (planInfos.Count > 0)
+                {
+                    var result = _executePlanInfoService.UpdateRangeExecutePlanInfo(planInfos);
+                    if (result)
+                    {
+                        GetEexecutePlanInfosByProductLineCode();
+                    }
+                }
+                
+            }catch(Exception ex)
             {
-                //传给出库
-                NextPassExecutePlanInfoEvent?.Invoke(planInfo);
+                logHelper.Error("计划下传异常", ex);
             }
+            return planInfo;
         }
     }
 }

Aucma.Scada.Business/Aucma.Scada.Business.csproj

@@ -46,6 +46,7 @@
     <Compile Include="MainBusiness.cs" />
     <Compile Include="OutStoreBusiness.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TaskInfoBusiness.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HighWayIot.Config\HighWayIot.Config.csproj">

Aucma.Scada.Business/TaskInfoBusiness.cs

@@ -0,0 +1,46 @@
+using HighWayIot.Config;
+using HighWayIot.Log4net;
+using HighWayIot.Repository.domain;
+using HighWayIot.Repository.service;
+using HighWayIot.Repository.service.Impl;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Scada.Business
+{
+    public sealed class TaskInfoBusiness
+    {
+        private static readonly Lazy<TaskInfoBusiness> lazy = new Lazy<TaskInfoBusiness>(() => new TaskInfoBusiness());
+        public static TaskInfoBusiness Instance
+        {
+            get
+            {
+                return lazy.Value;
+            }
+        }
+
+        private LogHelper logHelper = LogHelper.Instance;
+
+        private AppConfig appConfig = AppConfig.Instance;
+
+        private IRealTaskInfoService taskInfoService = new RealTaskInfoServiceImpl();
+
+        public TaskInfoBusiness()
+        {
+
+        }
+
+        /// <summary>
+        /// 获取计划列表
+        /// </summary>
+        /// <param name="taskType"></param>
+        /// <returns></returns>
+        public List<RealTaskInfo> GetTaskInfos(int taskType)
+        {
+             return taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, taskType);
+        }
+    }
+}

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

@@ -1 +1 @@
-5688e2e412368ec46789c0d63f0ae7f9b6a08427
+e8387b0c5844bceebdf1708a1ad31b3a6f43c6e9

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

@@ -91,8 +91,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Converter\AssemblyPlan\PlanStatusConverter.cs" />
     <Compile Include="Converter\LinerInventory\StatusLabelConverter.cs" />
     <Compile Include="Converter\ShellInventory\StatusLabelConverter.cs" />
+    <Compile Include="Converter\TaskInfo\TaskStatusConverter.cs" />
     <Compile Include="Page\AssemblyPlan\AssemblyPlanControl.xaml.cs">
       <DependentUpon>AssemblyPlanControl.xaml</DependentUpon>
     </Compile>

Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs

@@ -0,0 +1,46 @@
+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.AssemblyPlan
+{
+    public class PlanStatusConverter : 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;
+                    case 3:
+                        result = "完成";
+                        break;
+                    default:
+                        break;
+                }
+                return result;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+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 TaskStatusConverter : 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;
+                    case 3:
+                        result = "完成";
+                        break;
+                    default:
+                        break;
+                }
+                return result;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml

@@ -5,8 +5,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+             xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
              mc:Ignorable="d" 
             d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
+    <Control.Resources>
+        <local1:PlanStatusConverter x:Key="PlanStatusConverter" />
+    </Control.Resources>
     <Grid Margin="5,5">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -208,21 +212,23 @@
                       Foreground="Gray" >
                             <!--resourceStyle 399行修改选中字体颜色-->
                             <DataGrid.Columns>
-                                <!--<DataGridTextColumn Binding="{Binding executeOrder}" Header="编号" Width="1*"  IsReadOnly="True"/>-->
                                 <DataGridTextColumn Binding="{Binding executePlanCode}" Header="计划编号" Width="1*" IsReadOnly="True"/>
-                                <DataGridTextColumn Binding="{Binding productPlanCode}" Header="生产计划" Width="1*" IsReadOnly="True"/>
+                                <!--<DataGridTextColumn Binding="{Binding productPlanCode}" Header="生产计划" Width="1*" IsReadOnly="True"/>-->
                                 <DataGridTextColumn Binding="{Binding materialName}" Header="产品型号" Width="1*" IsReadOnly="True"/>
                                 <DataGridTextColumn Binding="{Binding planAmount}" Header="计划数量" Width="1*" IsReadOnly="True"/>
                                 <DataGridTextColumn Binding="{Binding completeAmount}" Header="完成数量" Width="1*" IsReadOnly="True"/>
                                 <DataGridTextColumn Binding="{Binding beginTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="开始时间" Width="1*" IsReadOnly="True"/>
+                                <DataGridTextColumn Binding="{Binding executeStatus,Converter={StaticResource PlanStatusConverter}}" Header="执行状态" Width="1*" IsReadOnly="True"/>
+                                <!--<DataGridTextColumn Binding="{Binding endTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="完成时间" Width="1*" IsReadOnly="True"/>-->
+                                <!--<DataGridTextColumn Binding="{Binding createdTime ,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="创建时间" Width="1*" IsReadOnly="True"/>-->
                                 <DataGridTemplateColumn Header="操作" Width="2*">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <StackPanel Orientation="Horizontal">
-                                                <Button Content="上移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
-                                                <Button Content="下移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
-                                                <Button Content="删除" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
-                                                <Button Content="下传" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="45" Command="{Binding DataContext.NextPassCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                                <Button Content="上移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                                <Button Content="下移" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                                <Button Content="删除" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                                <Button Content="下传" CommandParameter="{Binding executePlanCode}" Background="#007DFA" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="DeepSkyBlue" BorderThickness="0" Width="45" Command="{Binding DataContext.NextPassCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
                                             </StackPanel>
                                         </DataTemplate>
                                     </DataGridTemplateColumn.CellTemplate>
@@ -239,8 +245,7 @@
                                     <ComboBoxItem Content="手动" IsSelected="True"/>
                                     <ComboBoxItem Content="自动" />
                                 </ComboBox>
-
-                                <Button Content="计划维护" Command="{Binding PlanInfoEditCommand}" Background="#007DFA" Foreground="white" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                                <Button Content="计划维护"  Command="{Binding PlanInfoEditCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA"  Width="80" Height="30"  Margin="20,0,0,0"/>
                             </StackPanel>
                         </Border>
                     </Grid>

Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
         mc:Ignorable="d"
-        Title="MES生产计划" Height="450" Width="800">
+        Title="MES生产计划" Height="450" Width="800" Name="window">
     <Border Margin="5" Background="White" CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
@@ -29,8 +29,8 @@
                         <ComboBoxItem Content="SC485" />
                     </ComboBox>
 
-                    <Button Content="查询" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
-                    <Button Content="重置" Command="{Binding ResetCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                    <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30"  Width="80" />
+                    <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
                 </StackPanel>
             </Border>
             <!--计划列表-->
@@ -68,7 +68,8 @@
                         <TextBox FontSize="15" Text="{Binding TransmitAmount}" Foreground="Gray" Width="150" Margin="5,0,10,0"/>
                     </StackPanel>
                     <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-                        <Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Background="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                        <Button Content="计划下达" Command="{Binding PlanInfoTransmitCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="white" Margin="20,0,50,0" Height="30" Width="80" />
+                        <Button Content="取    消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Style="{StaticResource  BUTTON_AGREE}" Background="#FF9900" Foreground="white" Margin="20,0,50,0" Height="30" BorderBrush="#FF9900" Width="80" />
                     </StackPanel>
                 </Grid>
             </Border>

Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml

@@ -5,8 +5,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+             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" />
+    </Control.Resources>
     <Grid Margin="5,5">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -146,8 +150,8 @@
                             <ComboBoxItem Content="内胆" />
                         </ComboBox>
 
-                        <Button Content="查询" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
-                        <Button Content="重置" Command="{Binding ResetCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                        <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
+                        <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
                     </StackPanel>
                 </Border>
                 <DataGrid Grid.Row="1" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent" 
@@ -162,7 +166,7 @@
                         <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding taskStatus}" 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"/>
                     </DataGrid.Columns>
                 </DataGrid>

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

@@ -4,8 +4,12 @@
              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.OutStoreInfo"
+             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" />
+    </Control.Resources>
     <Grid Margin="5,5">
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -94,7 +98,7 @@
                                 </Border>
 
                                 <Border Grid.Row="3" BorderBrush="Red" BorderThickness="0" CornerRadius="5" VerticalAlignment="Center" HorizontalAlignment="Right" >
-                                    <Button Content="手工操作" Command="{Binding HandWorkCommand}" Background="#007DFA" Foreground="White" Margin="0,0,120,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                                    <Button Content="手工操作" Command="{Binding HandWorkCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="0,0,120,0" Height="30"  Width="80" />
                                 </Border>
 
 
@@ -149,11 +153,11 @@
                             <ComboBoxItem Content="SC485" />
                         </ComboBox>-->
 
-                        <Button Content="查询" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
-                        <Button Content="重置" Command="{Binding ResetCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
+                        <Button Content="查询" Command="{Binding QueryCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" Width="80" />
+                        <Button Content="重置" Command="{Binding ResetCommand}" Style="{StaticResource  BUTTON_AGREE}" Background="#007DFA" BorderBrush="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30"  Width="80" />
                     </StackPanel>
                 </Border>
-                <DataGrid Grid.Row="2" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent" 
+                <DataGrid Grid.Row="2" Name="DG" ItemsSource="{Binding OutstoreTask}" Background="Transparent" 
                       FontSize="15" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
@@ -165,7 +169,7 @@
                         <DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="*" IsReadOnly="True"/>
                         <DataGridTextColumn Binding="{Binding spaceName}" Header="出库货道" Width="*" IsReadOnly="True"/>
-                        <DataGridTextColumn Binding="{Binding taskStatus}" 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"/>
                         <DataGridTemplateColumn Header="操作" Width="*">
                             <DataGridTemplateColumn.CellTemplate>

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

@@ -32,16 +32,14 @@
                      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 taslType}" 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 spaceName}" Header="货道" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding beginTime}" Header="执行时间" Width="*" IsReadOnly="True"/>
+                            <DataGridTextColumn Binding="{Binding taskStatus}" Header="状态" Width="*" IsReadOnly="True"/>
                         </DataGrid.Columns>
                     </DataGrid>
                 </Border>

Aucma.Scada.UI/bin/Debug/Log/2023-10-09/LogError.html

@@ -0,0 +1,41 @@
+<HR COLOR=red>
+异常时间：2023-10-09 09:07:06,649 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 09:08:32,076 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 09:21:50,287 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 13:50:07,251 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 13:58:00,508 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 13:59:04,313 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 14:00:48,640 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-10-09 14:03:51,900 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 通过产线工位获取执行顺异常<br>【异常类型】：InvalidOperationException <br>【异常信息】：Sequence contains no elements <br>【堆栈调用】：   at System.Linq.Enumerable.First[TSource](IEnumerable`1 source)<br>   at HighWayIot.Repository.service.Impl.ExecutePlanInfoServiceImpl.GetExecuteOrderByProductLineCode(String productLineCode) in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\ExecutePlanInfoServiceImpl.cs:line 37 <BR>
+ <HR Size=1>

Aucma.Scada.UI/bin/Debug/config/App.Ini

@@ -1,17 +1,18 @@
 [system]
 mesConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma
 scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma
-#组装工位编号
+
 stationCode=ZZ-01
-#箱壳库编号
+
 shellStoreCode=XKJCK-001
-#内胆库编号
+
 linerStoreCode=NDJCK-001
-#箱壳物料类型编号（查询BOM）
+
 shellMaterialType=3
-#内胆物料类型编号（查询BOM）
+
 linerMaterialType=4
-#入库任务类型编号
+
 instoreTaskType=1
-#出库任务类型编号
+
 outstoreTaskType=2
+stationName=Ïä¿ÇÄÚµ¨×é×°

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

@@ -1 +1 @@
-f0f0a97076c4011da85f7da16de72ae8a0e90d76
+6d8c9680f6c285ca6dae8eef53d1764327994fd2

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
 
-29-1097241565
+311355729353
 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
 
-30-1851811349
+32601159569
 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.lref

@@ -1,5 +1,16 @@
-
-
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;;
 FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
 FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
 

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CB424BB5A432D0CD7DB5A57BB1F8F035C55B21DD87C2F724DCAF77FD7153744E"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A08B9C7140DB0AACAE086B977EE7C330BEFBFCCDB35F4D977FB64FC20FD7CF70"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -9,6 +9,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using Aucma.Scada.UI.Converter.AssemblyPlan;
 using Aucma.Scada.UI.Page.AssemblyPlan;
 using LiveCharts.Wpf;
 using System;

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CB424BB5A432D0CD7DB5A57BB1F8F035C55B21DD87C2F724DCAF77FD7153744E"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A08B9C7140DB0AACAE086B977EE7C330BEFBFCCDB35F4D977FB64FC20FD7CF70"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -9,6 +9,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using Aucma.Scada.UI.Converter.AssemblyPlan;
 using Aucma.Scada.UI.Page.AssemblyPlan;
 using LiveCharts.Wpf;
 using System;

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "479BD801257556B8B8B923709C49923E176269540CBC6E8A5FD72600F0AF08EB"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E14629875FB628F7D746EDF2F700170786DE8BBCE34B9BA27F9EDF260682AFAA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -41,6 +41,14 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
     public partial class PlanInfoEditWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
+        #line 8 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow window;
+        
+        #line default
+        #line hidden
+        
+        
         #line 38 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
@@ -79,6 +87,9 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
             switch (connectionId)
             {
             case 1:
+            this.window = ((Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow)(target));
+            return;
+            case 2:
             this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
             
             #line 43 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"

Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "479BD801257556B8B8B923709C49923E176269540CBC6E8A5FD72600F0AF08EB"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E14629875FB628F7D746EDF2F700170786DE8BBCE34B9BA27F9EDF260682AFAA"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -41,6 +41,14 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
     public partial class PlanInfoEditWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
+        #line 8 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow window;
+        
+        #line default
+        #line hidden
+        
+        
         #line 38 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dataGrid;
@@ -79,6 +87,9 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan {
             switch (connectionId)
             {
             case 1:
+            this.window = ((Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow)(target));
+            return;
+            case 2:
             this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
             
             #line 43 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml"

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3E8DCF182051F470D929AE86EB7AFB158BEEAD510E26D08E064F9503D8A5264A"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A05E59C5C19F8D68AD26227566090DA3164C037974EBC97A5B9A5093BEF8411F"
 //------------------------------------------------------------------------------
 // <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.InStoreInfo;
 using LiveCharts.Wpf;
 using System;
@@ -42,7 +43,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
     public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 153 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 157 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         
@@ -50,7 +51,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
         #line hidden
         
         
-        #line 187 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 191 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3E8DCF182051F470D929AE86EB7AFB158BEEAD510E26D08E064F9503D8A5264A"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A05E59C5C19F8D68AD26227566090DA3164C037974EBC97A5B9A5093BEF8411F"
 //------------------------------------------------------------------------------
 // <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.InStoreInfo;
 using LiveCharts.Wpf;
 using System;
@@ -42,7 +43,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
     public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 153 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 157 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         
@@ -50,7 +51,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
         #line hidden
         
         
-        #line 187 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 191 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         

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}" "5FB9446BF266699C482F4CB29F1DD1EFAEF960A12D9CD35EEED9A6A7F54C5669"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EC447A4FD95887F47EBA0FEE1DAEC7F84ECFD2CC6AAE2C000652D0173BFAE851"
 //------------------------------------------------------------------------------
 // <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.OutStoreInfo;
 using System;
 using System.Diagnostics;
@@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
     public partial class OutStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 116 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 120 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         
@@ -49,7 +50,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
         #line hidden
         
         
-        #line 156 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 160 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         

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}" "5FB9446BF266699C482F4CB29F1DD1EFAEF960A12D9CD35EEED9A6A7F54C5669"
+#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EC447A4FD95887F47EBA0FEE1DAEC7F84ECFD2CC6AAE2C000652D0173BFAE851"
 //------------------------------------------------------------------------------
 // <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.OutStoreInfo;
 using System;
 using System.Diagnostics;
@@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
     public partial class OutStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 116 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 120 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         
@@ -49,7 +50,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo {
         #line hidden
         
         
-        #line 156 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
+        #line 160 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid DG;
         

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}" "288EEAB9D5E82F5B10E599F42889205BFAF944BD63AD9CDE983A4E6BB70C983A"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "51CDF8A469AB69CE4DB7E52A9708C0AD79F1AB4758863636AE5C4772ED04EF94"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

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}" "288EEAB9D5E82F5B10E599F42889205BFAF944BD63AD9CDE983A4E6BB70C983A"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "51CDF8A469AB69CE4DB7E52A9708C0AD79F1AB4758863636AE5C4772ED04EF94"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

Aucma.Scada.UI/templates/style/resourceStyle.xaml

@@ -403,7 +403,6 @@
         </Setter>
     </Style>
 
-
     <!--TextBox样式-->
     <Style TargetType="{x:Type TextBox}">
         <Setter Property="Template">

Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs

@@ -2,6 +2,7 @@
 using Aucma.Scada.UI.Page.AssemblyPlan;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using HighWayIot.Config;
 using HighWayIot.Repository.domain;
 using HighWayIot.Repository.service;
 using HighWayIot.Repository.service.Impl;
@@ -20,10 +21,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
     public class AssemblyPlanViewModel : ViewModelBase
     {
 
-        private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl();
-
         private AssemblyPlanBusiness assemblyPlanBusiness = AssemblyPlanBusiness.Instance;
 
+        private AppConfig appConfig = AppConfig.Instance;
+
         public AssemblyPlanViewModel()
         {
             MoveUpCommand = new RelayCommand<object>(obj => MoveUp(obj));
@@ -33,12 +34,6 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 
             PlanInfoEditCommand = new RelayCommand(PlanInfoEdit);
 
-            stationName = "箱壳内胆组装";
-            orderCode = System.Guid.NewGuid().ToString();
-            planCode = System.Guid.NewGuid().ToString();
-            productModel = "SC232";
-            beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-
             assemblyPlanBusiness.RefreshExecutePlanInfoEvent += RefreshDataGrid;
 
             Init();
@@ -222,6 +217,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
             bool result = assemblyPlanBusiness.ExecutePlanInfo_Delete(info);
             if (result)
             {
+                OrderCode = string.Empty;
+                PlanCode = string.Empty;
+                ProductModel = string.Empty;
+                BeginTime = string.Empty;
                 MessageBox.Show("执行计划删除成功");
             }
             else
@@ -237,9 +236,26 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         public void NextPass(object obj)
         {
             string info = obj as string;
-            assemblyPlanBusiness.ExecutePlanInfo_NextPass(info);
+            if(info == planCode)
+            {
+                MessageBox.Show("该计划正在执行中，请勿重复下传");
+            }
+            else
+            {
+                var result = assemblyPlanBusiness.ExecutePlanInfo_NextPass(info, planCode);
+                if(result != null)
+                {
+                    RefreshPlanExecute(result);
+                    MessageBox.Show("执行计划已下达");
+                }
+                else
+                {
+                    MessageBox.Show("执行计划下达失败");
+                }
+                
+            }
 
-            MessageBox.Show("执行计划已下达");
+            
         }
 
         /// <summary>
@@ -247,8 +263,16 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         /// </summary>
         public void Init()
         {
+            var planInfos = assemblyPlanBusiness.GetEexecutePlanInfosByProductLineCode();
+            RefreshDataGrid(planInfos);
 
-            RefreshDataGrid(assemblyPlanBusiness.GetEexecutePlanInfosByProductLineCode());
+            //加载正在执行的计划
+            planInfos = planInfos.Where(x => x.executeStatus == 2).ToList();
+            if(planInfos.Count > 0)
+            {
+                ExecutePlanInfo planInfo = planInfos.OrderBy(x=>x.executeOrder).First();
+                RefreshPlanExecute(planInfo);
+            }
 
             MaterialNameList = new List<string>()
             {
@@ -304,6 +328,20 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
             PlanInfoEditWindow planInfoEditWindow = new PlanInfoEditWindow();
             planInfoEditWindow.ShowDialog();
         }
+
+        /// <summary>
+        /// 刷新计划执行
+        /// </summary>
+        /// <param name="planInfo"></param>
+        private void RefreshPlanExecute(ExecutePlanInfo planInfo)
+        {
+            StationName = appConfig.stationName;
+            OrderCode = planInfo.orderCode;
+            PlanCode = planInfo.executePlanCode;
+            ProductModel = planInfo.materialName;
+            DateTime dateTime = (DateTime)planInfo.beginTime;
+            BeginTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss");
+        }
     }
 
    

Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs

@@ -27,6 +27,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         {
             PlanInfoTransmitCommand = new RelayCommand(PlanInfoTransmit);
             MouseClickCommand = new RelayCommand<object>(MouseClick);
+            CloseWindowCommand = new RelayCommand<object>(t => CloseWindow(t));
             Query();
         }
 
@@ -92,6 +93,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
         public RelayCommand PlanInfoTransmitCommand { get; set; }
 
         public RelayCommand<object> MouseClickCommand { get; set; }
+
+        public RelayCommand<object> CloseWindowCommand { get; set; }
         #endregion
 
 
@@ -130,5 +133,15 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
             ProductPlanCode = info.planCode;
             MaterialCode = info.materialName;
         }
+
+        private void CloseWindow(object parameter)
+        {
+            var window = parameter as Window;
+            if (window != null)
+            {
+                window.Close();
+            }
+
+        }
     }
 }

Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs

@@ -113,12 +113,12 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo
         /// <summary>
         /// 出库任务DataGrid
         /// </summary>
-        private IEnumerable instoreTask;
+        private IEnumerable outstoreTask;
 
-        public IEnumerable InstoreTask
+        public IEnumerable OutstoreTask
         {
-            get { return instoreTask; }
-            set { instoreTask = value; RaisePropertyChanged(() => InstoreTask); }
+            get { return outstoreTask; }
+            set { outstoreTask = value; RaisePropertyChanged(() => OutstoreTask); }
 
         }
 
@@ -196,7 +196,7 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo
         }
 
         /// <summary>
-        /// 刷新入库任务列表
+        /// 刷新出库任务列表
         /// </summary>
         /// <param name="taskInfo"></param>
         private void RefreshOutStoreTask(RealTaskInfo taskInfo)
@@ -206,7 +206,7 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo
                 App.Current.Dispatcher.Invoke((Action)(() =>
                 {
                     taskItems.Add(taskInfo);
-                    InstoreTask = taskItems;
+                    OutstoreTask = taskItems;
                 }));
             }
             catch (Exception ex)
@@ -271,7 +271,7 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo
                         {
                             taskItems.Add(item);
                         }
-                        InstoreTask = taskItems.OrderBy(x=>x.createTime);
+                        OutstoreTask = taskItems.OrderBy(x=>x.createTime);
                     }));
                 }
             }

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

@@ -1,4 +1,5 @@
-using GalaSoft.MvvmLight;
+using Aucma.Scada.Business;
+using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using HighWayIot.Repository.domain;
 using HighWayIot.Repository.service;
@@ -15,20 +16,23 @@ 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.InStoreTask();
+            this.OutStoreTask();
         }
 
         #region 参数定义
         /// <summary>
         /// 任务列表DataGrid
         /// </summary>
-        private ObservableCollection<SysUserInfo> taskInfoDataGrid;
+        private ObservableCollection<RealTaskInfo> taskInfoDataGrid;
 
-        public ObservableCollection<SysUserInfo> TaskInfoDataGrid
+        public ObservableCollection<RealTaskInfo> TaskInfoDataGrid
         {
             get { return taskInfoDataGrid; }
             set { taskInfoDataGrid = value; RaisePropertyChanged(() => TaskInfoDataGrid); }
@@ -78,18 +82,17 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo
         /// <param name="obj"></param>
         private void InStoreTask()
         {
-            var models = sysUserInfoService.GetUserInfos();
+            var models = taskInfoBusiness.GetTaskInfos(1);
 
-            TaskInfoDataGrid = new ObservableCollection<SysUserInfo>();
-            RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            TaskInfoDataGrid = new ObservableCollection<RealTaskInfo>();
+            //RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
             if (models != null)
             {
                 models.ForEach(
                 arg =>
                 {
-                    arg.userName = "入库任务";
                     TaskInfoDataGrid.Add(arg);
-                    RecordInfoDataGrid.Add(arg);
+                    //RecordInfoDataGrid.Add(arg);
                 });
             }
         }
@@ -100,18 +103,17 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo
         /// <param name="obj"></param>
         private void OutStoreTask()
         {
-            var models = sysUserInfoService.GetUserInfos();
+            var models = taskInfoBusiness.GetTaskInfos(2);
 
-            TaskInfoDataGrid = new ObservableCollection<SysUserInfo>();
-            RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            TaskInfoDataGrid = new ObservableCollection<RealTaskInfo>();
+            //RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
             if (models != null)
             {
                 models.ForEach(
                 arg =>
                 {
-                    arg.userName = "出库任务";
                     TaskInfoDataGrid.Add(arg);
-                    RecordInfoDataGrid.Add(arg);
+                    //RecordInfoDataGrid.Add(arg);
                 });
             }
         }

HighWayIot.Config/AppConfig.cs

@@ -25,7 +25,7 @@ namespace HighWayIot.Config
 
         private AppConfig()
         {
-
+            stationName = "箱壳内胆组装";
         }
 
         public string mesConnStr
@@ -48,6 +48,16 @@ namespace HighWayIot.Config
             get { return iniHelper.IniReadValue("system", "stationCode"); }
             set { iniHelper.IniWriteValue("system", "stationCode", value); }
         }
+
+        /// <summary>
+        /// 工位名称
+        /// </summary>
+        public string stationName
+        {
+            get { return iniHelper.IniReadValue("system", "stationName"); }
+            //get { return "箱壳内胆组装"; }
+            set { iniHelper.IniWriteValue("system", "stationName", value); }
+        }
         
         /// <summary>
         /// 箱壳库编号

HighWayIot.Repository/domain/ExecutePlanInfo.cs

@@ -93,5 +93,11 @@ namespace HighWayIot.Repository.domain
         /// </summary>
         [SugarColumn(ColumnName = "EXECUTE_STATUS")]
         public int executeStatus { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnName = "CREATED_TIME")]
+        public DateTime? createdTime { get; set; }
     }
 }