change - 任务列表界面设计

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

@@ -131,6 +131,7 @@
     <Compile Include="viewModel\MainViewModel.cs" />
     <Compile Include="viewModel\RecordViewModel.cs" />
     <Compile Include="viewModel\InventoryInfo\ShellInventoryViewModel.cs" />
+    <Compile Include="viewModel\TaskInfo\TaskInfoViewModel.cs" />
     <Page Include="Page\AssemblyPlan\AssemblyPlanControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

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

@@ -126,7 +126,7 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
-                <DataGrid Grid.Row="0" ItemsSource="{Binding ShellInstoreTask}" Background="Transparent" 
+                <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="Transparent" 
                       FontSize="15" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
@@ -134,12 +134,24 @@
                       Foreground="White" >
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
-                        <DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="100" 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  Header="功能操作" Width="*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="1*"  IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding userName}" Header="产品型号" Width="1*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding userName}" Header="计划数量" Width="1*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding userName}" Header="实际完成" Width="1*" IsReadOnly="True"/>
+                        <DataGridTextColumn Binding="{Binding userName}" Header="开始时间" Width="1*" IsReadOnly="True"/>
+                        <DataGridTemplateColumn Header="操作" Width="2*">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button Content="上移" CommandParameter="{Binding userName}" 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 userName}" 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 userName}" 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 userName}" 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  }}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+
+                        </DataGridTemplateColumn>
                     </DataGrid.Columns>
                 </DataGrid>
 

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

@@ -118,11 +118,11 @@
                             <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}" 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" />
                     </StackPanel>
                 </Border>
-                <DataGrid Grid.Row="1" ItemsSource="{Binding ShellInstoreTask}" Background="Transparent" 
+                <DataGrid Grid.Row="1" ItemsSource="{Binding InstoreTask}" Background="Transparent" 
                       FontSize="15" ColumnHeaderHeight="35" 
                       RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
@@ -130,12 +130,12 @@
                       Foreground="White" >
                     <!--resourceStyle 399行修改选中字体颜色-->
                     <DataGrid.Columns>
-                        <DataGridTextColumn Binding="{Binding userId}" Header="物料条码" Width="100" 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="100" IsReadOnly="True"/>
+                        <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 beginTime}" Header="任务时间" Width="*" IsReadOnly="True"/>
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>

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

@@ -5,8 +5,70 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
+    <Grid Margin="5,5">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="14*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
+            <Button Content="入库任务" x:Name="inStore"  Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=inStore}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
+            <Button Content="出库任务" x:Name="outStore"  Command="{Binding TaskCommand}" CommandParameter="{Binding Name,ElementName=outStore}" Style="{StaticResource  BUTTON_AGREE}"  Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="0,0,10,0"/>
+        </StackPanel>
+
+        <Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
             <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="5*"/>
+                </Grid.RowDefinitions>
+                <Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5">
+                    <DataGrid ItemsSource="{Binding TaskInfoDataGrid}" Background="Transparent" 
+                      FontSize="15" ColumnHeaderHeight="35" 
+                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
+                      Foreground="White" >
+                        <!--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"/>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Border>
 
+                <Border Grid.Row="2" BorderBrush="CadetBlue" BorderThickness="1" CornerRadius="5" Margin="0,10,0,0">
+                    <DataGrid ItemsSource="{Binding RecordInfoDataGrid}" Background="Transparent" 
+                      FontSize="15" ColumnHeaderHeight="35" 
+                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
+                      ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" 
+                      Foreground="White" >
+                        <!--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"/>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Border>
+            </Grid>
+        </Border>
     </Grid>
 </UserControl>

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

@@ -1,4 +1,5 @@
-using System;
+using Aucma.Scada.UI.viewModel.TaskInfo;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -23,6 +24,9 @@ namespace Aucma.Scada.UI.Page.TaskInfo
         public TaskInfoControl()
         {
             InitializeComponent();
+
+            TaskInfoViewModel taskInfoViewModel = new TaskInfoViewModel();
+            this.DataContext = taskInfoViewModel;
         }
     }
 }

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

@@ -0,0 +1,11 @@
+<HR COLOR=red>
+异常时间：2023-09-22 13:23:10,177 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 用户信息获取异常<br>【异常类型】：SqlSugarException <br>【异常信息】：中文提示 :  连接数据库过程中发生错误，检查服务器是否正常连接字符串是否正确，错误信息：Unable to connect to any of the specified MySQL hosts.DbType="MySql";ConfigId="mysql".<br>English Message : Connection open error . Unable to connect to any of the specified MySQL hosts.DbType="MySql";ConfigId="mysql" <br>【堆栈调用】：   at SqlSugar.Check.Exception(Boolean isException, String message, String[] args)<br>   at SqlSugar.AdoProvider.CheckConnection()<br>   at SqlSugar.MySqlProvider.GetCommand(String sql, SugarParameter[] parameters)<br>   at SqlSugar.AdoProvider.GetDataReader(String sql, SugarParameter[] parameters)<br>   at SqlSugar.QueryableProvider`1.GetData[TResult](KeyValuePair`2 sqlObj)<br>   at SqlSugar.QueryableProvider`1._ToList[TResult]()<br>   at SqlSugar.QueryableProvider`1.ToList()<br>   at SqlSugar.SimpleClient`1.GetList()<br>   at HighWayIot.Repository.service.Impl.SysUserInfoServiceImpl.GetUserInfos() in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\SysUserInfoServiceImpl.cs:line 21 <BR>
+ <HR Size=1><HR COLOR=red>
+异常时间：2023-09-22 13:23:12,802 [1] <BR>
+异常级别：ERROR <BR>
+异 常 类：logerror [(null)] <BR>
+【附加信息】 : 用户信息获取异常<br>【异常类型】：SqlSugarException <br>【异常信息】：中文提示 :  连接数据库过程中发生错误，检查服务器是否正常连接字符串是否正确，错误信息：Unable to connect to any of the specified MySQL hosts.DbType="MySql";ConfigId="mysql".<br>English Message : Connection open error . Unable to connect to any of the specified MySQL hosts.DbType="MySql";ConfigId="mysql" <br>【堆栈调用】：   at SqlSugar.Check.Exception(Boolean isException, String message, String[] args)<br>   at SqlSugar.AdoProvider.CheckConnection()<br>   at SqlSugar.MySqlProvider.GetCommand(String sql, SugarParameter[] parameters)<br>   at SqlSugar.AdoProvider.GetDataReader(String sql, SugarParameter[] parameters)<br>   at SqlSugar.QueryableProvider`1.GetData[TResult](KeyValuePair`2 sqlObj)<br>   at SqlSugar.QueryableProvider`1._ToList[TResult]()<br>   at SqlSugar.QueryableProvider`1.ToList()<br>   at SqlSugar.SimpleClient`1.GetList()<br>   at HighWayIot.Repository.service.Impl.SysUserInfoServiceImpl.GetUserInfos() in C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\service\Impl\SysUserInfoServiceImpl.cs:line 21 <BR>
+ <HR Size=1>

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

@@ -0,0 +1,157 @@
+<-------------->
+日志时间：2023-09-22 11:02:18,641 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:05:52,414 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:08:39,296 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:09:44,341 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:13:15,651 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:14:12,554 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:15:44,648 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:17:33,245 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:18:15,077 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:21:12,416 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:22:26,440 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:23:42,142 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:24:40,796 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:28:57,928 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:44:27,569 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:46:27,261 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:47:28,789 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 11:51:42,194 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:23:17,156 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:24:01,274 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:26:20,745 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:27:25,752 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:28:47,221 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:31:08,289 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:45:07,441 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:46:28,444 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:47:26,085 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:49:05,004 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:50:23,448 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 13:51:16,012 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:05:14,510 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:05:46,476 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:19:26,167 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:20:10,074 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:23:38,703 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:25:12,089 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:27:23,612 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:31:50,759 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-22 15:32:52,864 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ 

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

@@ -1 +1 @@
-4dd20336a0336e0342e692ff9031d4d65af3e6b2
+745ef1664c1dc9d016c34cebb9c5ae6d62a500b4

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt

@@ -70,3 +70,75 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\Inve
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\CommonServiceLocator.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Lierda.WPFHelper.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\MySql.Data.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\SqlSugar.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Data.SQLite.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\System.Windows.Interactivity.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\App.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\MainWindow.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\RecordControl.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\templates\style\resourceStyle.baml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.g.resources
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.Properties.Resources.resources
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.GenerateResource.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CoreCompileInputs.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb

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

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
 Aucma.Scada.UI
 none
 false
 DEBUG;TRACE
-C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
 12777446641
 
-251141458628
-1321100521871
+26391768726
+132398445931
 Page\AssemblyPlan\AssemblyPlanControl.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;
 
 False

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

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\
 Aucma.Scada.UI
 none
 false
 DEBUG;TRACE
-C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml
 12777446641
 
-26386888844
-1321100521871
+27-362801058
+132398445931
 Page\AssemblyPlan\AssemblyPlanControl.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;
 
 True

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

@@ -1,4 +1,15 @@
-
-
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
+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\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/Aucma.Scada.UI_MarkupCompile.lref

@@ -1,15 +1,15 @@
 
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\LogInfoControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\MainWindow.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\RecordControl.xaml;;
-FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
+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\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}" "FC78E8A5AACB9AA643259BE61C90DD50B7827F59EAE509AB950740FE0D6C6AAB"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DDA851D3EBB171A733E4F093D29225C5D376D9A4F5E09477AC080F28070FFE3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

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}" "FC78E8A5AACB9AA643259BE61C90DD50B7827F59EAE509AB950740FE0D6C6AAB"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DDA851D3EBB171A733E4F093D29225C5D376D9A4F5E09477AC080F28070FFE3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

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}" "6E9D8852065C199BF5AAFF334E05577FD71CE7E533A7312D6C33D42EA20B5C8B"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6AE98CFD2D24F6ADE85660E9DA3AB0F584118FC1434531A45BE5EEB1EFD4B0D0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

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}" "6E9D8852065C199BF5AAFF334E05577FD71CE7E533A7312D6C33D42EA20B5C8B"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6AE98CFD2D24F6ADE85660E9DA3AB0F584118FC1434531A45BE5EEB1EFD4B0D0"
 //------------------------------------------------------------------------------
 // <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}" "8B8DD773AF56221289040AE718017E8537B4ABC856C6B417876F2E874C284C86"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BB27CE25212190E71D85B70E7B4D893FCFC0D8047E3AEC15FFF13C9DC2D8ED3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,6 +40,22 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
     /// </summary>
     public partial class TaskInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 15 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button inStore;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 16 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button outStore;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -68,6 +84,15 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.inStore = ((System.Windows.Controls.Button)(target));
+            return;
+            case 2:
+            this.outStore = ((System.Windows.Controls.Button)(target));
+            return;
+            }
             this._contentLoaded = true;
         }
     }

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}" "8B8DD773AF56221289040AE718017E8537B4ABC856C6B417876F2E874C284C86"
+#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BB27CE25212190E71D85B70E7B4D893FCFC0D8047E3AEC15FFF13C9DC2D8ED3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,6 +40,22 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
     /// </summary>
     public partial class TaskInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 15 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button inStore;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 16 "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button outStore;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -68,6 +84,15 @@ namespace Aucma.Scada.UI.Page.TaskInfo {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.inStore = ((System.Windows.Controls.Button)(target));
+            return;
+            case 2:
+            this.outStore = ((System.Windows.Controls.Button)(target));
+            return;
+            }
             this._contentLoaded = true;
         }
     }

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

@@ -1,22 +1,37 @@
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using HighWayIot.Repository.domain;
+using HighWayIot.Repository.service;
+using HighWayIot.Repository.service.Impl;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Aucma.Scada.UI.viewModel.AssemblyPlan
 {
     public class AssemblyPlanViewModel : ViewModelBase
     {
 
+        private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl();
+
         public AssemblyPlanViewModel()
         {
+            MoveUpCommand = new RelayCommand<object>(obj => MoveUp(obj));
+            MoveDownCommand = new RelayCommand<object>(obj => MoveDown(obj));
+            DeletePlanCommand = new RelayCommand<object>(obj => DeletePlan(obj));
+            NextPassCommand = new RelayCommand<object>(obj => NextPass(obj));
+
             stationName = "箱壳内胆组装";
             orderCode = System.Guid.NewGuid().ToString();
             planCode = System.Guid.NewGuid().ToString();
             productModel = "SC232";
             beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+            Query();
         }
 
         #region 参数定义
@@ -69,6 +84,85 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
             get { return beginTime; }
             set { beginTime = value; RaisePropertyChanged(nameof(BeginTime)); }
         }
+
+        /// <summary>
+        /// 计划列表DataGrid
+        /// </summary>
+        private ObservableCollection<SysUserInfo> planInfoDataGrid;
+
+        public ObservableCollection<SysUserInfo> PlanInfoDataGrid
+        {
+            get { return planInfoDataGrid; }
+            set { planInfoDataGrid = value; RaisePropertyChanged(() => PlanInfoDataGrid); }
+
+        }
+        #endregion
+
+        #region 事件定义
+        /// <summary>
+        /// 上移事件
+        /// </summary>
+        public RelayCommand<object> MoveUpCommand { get; set; }
+
+        /// <summary>
+        /// 下移事件
+        /// </summary>
+        public RelayCommand<object> MoveDownCommand { get; set; }
+
+        /// <summary>
+        /// 删除计划
+        /// </summary>
+        public RelayCommand<object> DeletePlanCommand { get; set; }
+
+        /// <summary>
+        /// 下传事件
+        /// </summary>
+        public RelayCommand<object> NextPassCommand { get; set; }
         #endregion
+
+        /// <summary>
+        /// 箱壳入库任务列表查询
+        /// </summary>
+        public void Query()
+        {
+
+            var models = sysUserInfoService.GetUserInfos();
+
+            PlanInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            if (models != null)
+            {
+                models.ForEach(
+                arg =>
+                {
+                    PlanInfoDataGrid.Add(arg);
+                });
+            }
+        }
+
+        public void MoveUp(object obj)
+        {
+            string info = obj as string;
+            MessageBox.Show("上移：" + info);
         }
+
+        public void MoveDown(object obj)
+        {
+            string info = obj as string;
+            MessageBox.Show("下移：" + info);
+        }
+
+        public void DeletePlan(object obj)
+        {
+            string info = obj as string;
+            MessageBox.Show("删除：" + info);
+        }
+
+        public void NextPass(object obj)
+        {
+            string info = obj as string;
+            MessageBox.Show("下传：" + info);
+        }
+    }
+
+   
 }

Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs

@@ -20,7 +20,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
     {
         private LogHelper logHelper = LogHelper.Instance;
         private ObservableCollection<dynamic> listItems = new ObservableCollection<dynamic>();
-        private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl();
 
         public InStoreInfoViewModel()
         {
@@ -113,12 +112,12 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// <summary>
         /// 箱壳入库任务DataGrid
         /// </summary>
-        private ObservableCollection<SysUserInfo> shellInstoreTask;
+        private ObservableCollection<RealTaskInfo> instoreTask;
 
-        public ObservableCollection<SysUserInfo> ShellInstoreTask
+        public ObservableCollection<RealTaskInfo> InstoreTask
         {
-            get { return shellInstoreTask; }
-            set { shellInstoreTask = value; RaisePropertyChanged(()=> ShellInstoreTask); }
+            get { return instoreTask; }
+            set { instoreTask = value; RaisePropertyChanged(()=> InstoreTask); }
 
         }
 
@@ -222,30 +221,17 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         public void Query()
         {
 
-            var models = sysUserInfoService.GetUserInfos();
-
-            if (!string.IsNullOrEmpty(search))
+            InstoreTask = new ObservableCollection<RealTaskInfo>();
+            InstoreTask.Add(new RealTaskInfo()
             {
-                models = models.Where(x => x.userName.Contains(Search)).ToList();
-            }
-
-            if (!string.IsNullOrEmpty(materialTypeCombox))
-            {
-                PrintMessageToListBox(materialTypeCombox);
-            }
-
-            ShellInstoreTask = new ObservableCollection<SysUserInfo>();
-            LinerInstoreTask = new ObservableCollection<SysUserInfo>();
-            if (models != null)
-            {
-                models.ForEach(
-                arg =>
-                {
-                    ShellInstoreTask.Add(arg);
-                    LinerInstoreTask.Add(arg);
+                taskCode = System.Guid.NewGuid().ToString().Substring(0,6),
+                materialCode = "SC232",
+                materialType = "箱壳",
+                spaceCode = "1#",
+                taskStatus = 1,
+                beginTime = DateTime.Now
             });
         }
-        }
 
         /// <summary>
         /// 重置

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

@@ -0,0 +1,119 @@
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using HighWayIot.Repository.domain;
+using HighWayIot.Repository.service;
+using HighWayIot.Repository.service.Impl;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Scada.UI.viewModel.TaskInfo
+{
+    public class TaskInfoViewModel : ViewModelBase
+    {
+        private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl();
+        public TaskInfoViewModel()
+        {
+            TaskCommand = new RelayCommand<object>(obj => Task(obj));
+
+            this.InStoreTask();
+        }
+
+        #region 参数定义
+        /// <summary>
+        /// 任务列表DataGrid
+        /// </summary>
+        private ObservableCollection<SysUserInfo> taskInfoDataGrid;
+
+        public ObservableCollection<SysUserInfo> TaskInfoDataGrid
+        {
+            get { return taskInfoDataGrid; }
+            set { taskInfoDataGrid = value; RaisePropertyChanged(() => TaskInfoDataGrid); }
+
+        }
+
+        /// <summary>
+        /// 记录列表DataGrid
+        /// </summary>
+        private ObservableCollection<SysUserInfo> recordInfoDataGrid;
+
+        public ObservableCollection<SysUserInfo> RecordInfoDataGrid
+        {
+            get { return recordInfoDataGrid; }
+            set { recordInfoDataGrid = value; RaisePropertyChanged(() => RecordInfoDataGrid); }
+
+        }
+        #endregion
+
+        #region 事件定义
+        /// <summary>
+        /// 出入库任务按钮事件
+        /// </summary>
+        public RelayCommand<object> TaskCommand { get; set; }
+
+        #endregion
+
+        private void Task(object obj)
+        {
+            string info = obj as string;
+            switch (info)
+            {
+                case "inStore":
+                    InStoreTask();
+                    break;
+                case "outStore":
+                    OutStoreTask();
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 入库任务
+        /// </summary>
+        /// <param name="obj"></param>
+        private void InStoreTask()
+        {
+            var models = sysUserInfoService.GetUserInfos();
+
+            TaskInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            if (models != null)
+            {
+                models.ForEach(
+                arg =>
+                {
+                    arg.userName = "入库任务";
+                    TaskInfoDataGrid.Add(arg);
+                    RecordInfoDataGrid.Add(arg);
+                });
+            }
+        }
+
+        /// <summary>
+        /// 出库任务
+        /// </summary>
+        /// <param name="obj"></param>
+        private void OutStoreTask()
+        {
+            var models = sysUserInfoService.GetUserInfos();
+
+            TaskInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            RecordInfoDataGrid = new ObservableCollection<SysUserInfo>();
+            if (models != null)
+            {
+                models.ForEach(
+                arg =>
+                {
+                    arg.userName = "出库任务";
+                    TaskInfoDataGrid.Add(arg);
+                    RecordInfoDataGrid.Add(arg);
+                });
+            }
+        }
+    }
+}

HighWayIot.Common/HighWayIot.Common.csproj

@@ -47,6 +47,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IniHelper.cs" />
     <Compile Include="JsonChange.cs" />
     <Compile Include="MsgUtil.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

HighWayIot.Common/IniHelper.cs

@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Common
+{
+    public class IniHelper
+    {
+        public string path;
+
+        public IniHelper(string INIPath)
+        {
+            path = INIPath;
+        }
+
+        [DllImport("kernel32")]
+        private static extern long WritePrivateProfileString(string section, string key, string val, string filePath);
+
+        [DllImport("kernel32")]
+        private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath);
+
+
+        [DllImport("kernel32")]
+        private static extern int GetPrivateProfileString(string section, string key, string defVal, Byte[] retVal, int size, string filePath);
+
+        [DllImport("kernel32", EntryPoint = "GetPrivateProfileString")]
+        private static extern uint GetPrivateProfileStringA(string section, string key, string def, Byte[] retVal, int size, string filePath);
+
+        /// <summary>
+        /// 写INI文件
+        /// </summary>
+        /// <param name="Section"></param>
+        /// <param name="Key"></param>
+        /// <param name="Value"></param>
+        public void IniWriteValue(string Section, string Key, string Value)
+        {
+
+            WritePrivateProfileString(Section, Key, Value, this.path);
+        }
+
+        /// <summary>
+        /// 读取INI文件
+        /// </summary>
+        /// <param name="Section"></param>
+        /// <param name="Key"></param>
+        /// <returns></returns>
+        public string IniReadValue(string Section, string Key)
+        {
+            StringBuilder temp = new StringBuilder(255);
+            int i = GetPrivateProfileString(Section, Key, "", temp, 255, this.path);
+            //return temp.ToString();
+
+            string str = temp.ToString();
+
+            return str;
+        }
+        public byte[] IniReadValues(string section, string key)
+        {
+            byte[] temp = new byte[255];
+            int i = GetPrivateProfileString(section, key, "", temp, 255, this.path);
+            return temp;
+
+        }
+
+
+        /// <summary>
+        /// 删除ini文件下所有段落
+        /// </summary>
+        public void ClearAllSection()
+        {
+            IniWriteValue(null, null, null);
+        }
+        /// <summary>
+        /// 删除ini文件下personal段落下的所有键
+        /// </summary>
+        /// <param name="Section"></param>
+        public void ClearSection(string Section)
+        {
+            IniWriteValue(Section, null, null);
+        }
+
+        public List<string> ReadKeys(String SectionName)
+        {
+            return ReadKeys(SectionName, this.path);
+        }
+
+        public List<string> ReadKeys(string SectionName, string iniFilename)
+        {
+            List<string> result = new List<string>();
+            Byte[] buf = new Byte[65536];
+            uint len = GetPrivateProfileStringA(SectionName, null, null, buf, buf.Length, iniFilename);
+            int j = 0;
+            for (int i = 0; i < len; i++)
+                if (buf[i] == 0)
+                {
+                    result.Add(Encoding.Default.GetString(buf, j, i - j));
+                    j = i + 1;
+                }
+            return result;
+        }
+    }
+}

HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ac0a11ee7fe82dce7ae2872df4df8f2250e5b258
+0092f4c9cca736a00493309db0126e56a5fc8a73

HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.FileListAbsolute.txt

@@ -34,3 +34,15 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWa
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb

HighWayIot.Config/AppConfig.cs

@@ -0,0 +1,55 @@
+using HighWayIot.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Config
+{
+    public sealed class AppConfig
+    {
+
+        private static IniHelper iniHelper = new IniHelper(System.Environment.CurrentDirectory + "/config/App.InI");
+
+
+        private static readonly Lazy<AppConfig> lazy = new Lazy<AppConfig>(() => new AppConfig());
+        public static AppConfig Instance
+        {
+            get
+            {
+                return lazy.Value;
+            }
+        }
+
+
+        private AppConfig() { }
+
+        /// <summary>
+        /// 工位编号
+        /// </summary>
+        public string stationCode
+        {
+            get { return iniHelper.IniReadValue("system", "stationCode"); }
+            set { iniHelper.IniWriteValue("system", "stationCode", value); }
+        }
+        
+        /// <summary>
+        /// 箱壳库编号
+        /// </summary>
+        public string shellStoreCode
+        {
+            get { return iniHelper.IniReadValue("system", "shellStoreCode"); }
+            set { iniHelper.IniWriteValue("system", "shellStoreCode", value); }
+        }
+
+        /// <summary>
+        /// 内胆库编号
+        /// </summary>
+        public string linerStoreCode
+        {
+            get { return iniHelper.IniReadValue("system", "linerStoreCode"); }
+            set { iniHelper.IniWriteValue("system", "linerStoreCode", value); }
+        }
+    }
+}

HighWayIot.Config/HighWayIot.Config.csproj

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>HighWayIot.Config</RootNamespace>
+    <AssemblyName>HighWayIot.Config</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AppConfig.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\HighWayIot.Common\HighWayIot.Common.csproj">
+      <Project>{89A1EDD9-D79E-468D-B6D3-7D07B8843562}</Project>
+      <Name>HighWayIot.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

HighWayIot.Config/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("HighWayIot.Config")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HighWayIot.Config")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("75180ee5-13ae-499b-b0f6-c7bfee1140cc")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

HighWayIot.Config/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

HighWayIot.Repository/HighWayIot.Repository.csproj

@@ -61,16 +61,16 @@
   <ItemGroup>
     <Compile Include="domain\BaseBomInfo.cs" />
     <Compile Include="domain\BaseSpaceInfo.cs" />
+    <Compile Include="domain\ProductPlanInfo.cs" />
+    <Compile Include="domain\RealTaskInfo.cs" />
     <Compile Include="domain\SysUserInfo.cs" />
-    <Compile Include="domain\BaseDeviceinfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repository.cs" />
     <Compile Include="service\IBaseBomInfoService.cs" />
+    <Compile Include="service\IBaseSpaceInfoService.cs" />
     <Compile Include="service\Impl\BaseBomInfoServiceImpl.cs" />
     <Compile Include="service\ISysUserInfoService.cs" />
-    <Compile Include="service\IBaseDeviceinfoService.cs" />
     <Compile Include="service\Impl\SysUserInfoServiceImpl.cs" />
-    <Compile Include="service\Impl\BaseDeviceinfoServiceImpl.cs" />
     <Compile Include="SqlSugarHelper.cs" />
   </ItemGroup>
   <ItemGroup>

HighWayIot.Repository/domain/BaseBomInfo.cs

@@ -14,9 +14,60 @@ namespace HighWayIot.Repository.domain
         /// 主键标识 
         ///</summary>
         [SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true)]
-        public int ObjId { get; set; }
+        public int objId { get; set; }
 
+        /// <summary>
+        /// BOM编号
+        /// </summary>
         [SugarColumn(ColumnName = "BOM_CODE")]
         public string bomCode { get; set; }
+
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_CODE")]
+        public string materialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_NAME")]
+        public string materialName { get; set; }
+
+        /// <summary>
+        /// 物料类别
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_TYPE")]
+        public string materialType { get; set; }
+
+        /// <summary>
+        /// 标准数量
+        /// </summary>
+        [SugarColumn(ColumnName = "STANDARD_AMOUNT")]
+        public int standardAmount { get; set; }
+
+        /// <summary>
+        /// 父级编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PARENT_ID")]
+        public int parentId { get; set; }
+
+        /// <summary>
+        /// 工厂编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PLANT_CODE")]
+        public string plantCode { get; set; }
+
+        /// <summary>
+        /// 产线/工位
+        /// </summary>
+        [SugarColumn(ColumnName = "PRODUCTLINE_CODE")]
+        public string productLineCode { get; set; }
+
+        /// <summary>
+        /// 是否标识
+        /// </summary>
+        [SugarColumn(ColumnName = "IS_FLAG")]
+        public int isFlag { get; set; }
     }
 }

HighWayIot.Repository/domain/BaseDeviceinfo.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-namespace HighWayIot.Repository.domain
-{
-    /// <summary>
-    /// 设备信息
-    ///</summary>
-    [SugarTable("base_deviceInfo")]
-    public class BaseDeviceinfo
-    {
-        /// <summary>
-        /// 主键标识 
-        ///</summary>
-         [SugarColumn(ColumnName="objId" ,IsPrimaryKey = true ,IsIdentity = true  )]
-         public int ObjId { get; set; }
-        /// <summary>
-        /// 机台编号 
-        ///</summary>
-         [SugarColumn(ColumnName="process_Id"    )]
-         public int? ProcessId { get; set; }
-        /// <summary>
-        /// 位置编号 
-        ///</summary>
-         [SugarColumn(ColumnName="position_Id"    )]
-         public int? PositionId { get; set; }
-        /// <summary>
-        /// 设备编号 
-        ///</summary>
-         [SugarColumn(ColumnName="device_Id"    )]
-         public int? DeviceId { get; set; }
-        /// <summary>
-        /// 设备名称 
-        ///</summary>
-         [SugarColumn(ColumnName="device_Name"    )]
-         public string DeviceName { get; set; }
-        /// <summary>
-        /// 设备  IP 
-        ///</summary>
-         [SugarColumn(ColumnName="device_Ip"    )]
-         public string DeviceIp { get; set; }
-        /// <summary>
-        /// 设备端口 
-        ///</summary>
-         [SugarColumn(ColumnName="device_Port"    )]
-         public int? DevicePort { get; set; }
-        /// <summary>
-        /// 设备天线 
-        ///</summary>
-         [SugarColumn(ColumnName="device_Ant"    )]
-         public int? DeviceAnt { get; set; }
-        /// <summary>
-        /// 设备类型 
-        ///</summary>
-         [SugarColumn(ColumnName="device_Type"    )]
-         public string DeviceType { get; set; }
-    }
-}

HighWayIot.Repository/domain/ProductPlanInfo.cs

@@ -0,0 +1,91 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Repository.domain
+{
+    [SugarTable("PRODUCT_PLANINFO")]
+    public class ProductPlanInfo
+    {
+        /// <summary>
+        /// 主键标识 
+        ///</summary>
+        [SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 计划编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PLAN_CODE")]
+        public string planCode { get; set; }
+
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        [SugarColumn(ColumnName = "ORDER_CODE")]
+        public string orderCode { get; set; }
+
+        /// <summary>
+        /// 销售订单编号
+        /// </summary>
+        [SugarColumn(ColumnName = "SALEORDER_CODE")]
+        public string saleOrderCode { get; set; }
+
+        /// <summary>
+        /// 销售订单行号
+        /// </summary>
+        [SugarColumn(ColumnName = "SALEORDER_LINENUMBER")]
+        public string saleOrderLineNumber { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_CODE")]
+        public string materialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_NAME")]
+        public string materialName { get; set; }
+
+        /// <summary>
+        /// 产线/工位
+        /// </summary>
+        [SugarColumn(ColumnName = "PRODUCTLINE_CODE")]
+        public string productLinCode { get; set; }
+
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+        [SugarColumn(ColumnName = "PLAN_AMOUNT")]
+        public int planAmount { get; set; }
+
+        /// <summary>
+        /// 完成数量
+        /// </summary>
+        [SugarColumn(ColumnName = "COMPLETE_AMOUNT")]
+        public int completeAmount { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [SugarColumn(ColumnName = "BEGIN_TIME")]
+        public DateTime beginTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [SugarColumn(ColumnName = "END_TIME")]
+        public DateTime endTime { get; set; }
+
+        /// <summary>
+        /// 是否标识
+        /// </summary>
+        [SugarColumn(ColumnName = "IS_FLAG")]
+        public int isFlag { get; set; }
+    }
+}

HighWayIot.Repository/domain/RealTaskInfo.cs

@@ -0,0 +1,91 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Repository.domain
+{
+    [SugarTable("REAL_TASKINFO")]
+    public class RealTaskInfo
+    {
+        /// <summary>
+        /// 主键标识 
+        ///</summary>
+        [SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 任务编号
+        /// </summary>
+        [SugarColumn(ColumnName = "TASK_CODE")]
+        public string taskCode { get; set; }
+
+        /// <summary>
+        /// 任务类型：1-入库；2-出库
+        /// </summary>
+        [SugarColumn(ColumnName = "TASK_TYPE")]
+        public int taskType { get; set; }
+
+        /// <summary>
+        /// 任务状态：1-待执行；2-执行中；3-完成
+        /// </summary>
+        [SugarColumn(ColumnName = "TASK_STATUS")]
+        public int taskStatus { get; set; }
+
+        /// <summary>
+        /// 计划编号
+        /// </summary>
+        [SugarColumn(ColumnName = "PLAN_CODE")]
+        public string planCode { get; set; }
+
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_CODE")]
+        public string materialCode { get; set; }
+
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        [SugarColumn(ColumnName = "MATERIAL_Type")]
+        public string materialType { get; set; }
+
+        /// <summary>
+        /// 货道编号
+        /// </summary>
+        [SugarColumn(ColumnName = "SPACE_CODE")]
+        public string spaceCode { get; set; }
+
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+        [SugarColumn(ColumnName = "PLAN_AMOUNT")]
+        public int planAmount { get; set; }
+
+        /// <summary>
+        /// 完成数量
+        /// </summary>
+        [SugarColumn(ColumnName = "COMPLETE_AMOUNT")]
+        public int completeAmount { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [SugarColumn(ColumnName = "BEGIN_TIME")]
+        public DateTime beginTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [SugarColumn(ColumnName = "END_TIME")]
+        public DateTime endTime { get; set; }
+
+        /// <summary>
+        /// 是否标识
+        /// </summary>
+        [SugarColumn(ColumnName = "IS_FLAG")]
+        public int isFlag { get; set; }
+    }
+}

HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-803c746b6ef1bb18415b3fbf3d461e1ea5fd5a81
+4983dbf9af9ebd23a3ac3fbb10cccb6373dd508c

HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt

@@ -42,3 +42,22 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\Hi
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll.config
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Repository.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Common.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\MySql.Data.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\Oracle.ManagedDataAccess.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\SqlSugar.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\System.Data.SQLite.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\log4net.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Common.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\HighWayIot.Log4net.pdb
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\bin\Debug\Newtonsoft.Json.xml
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.AssemblyReference.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CoreCompileInputs.cache
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll
+C:\项目代码\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb

HighWayIot.Repository/service/IBaseDeviceinfoService.cs

@@ -1,20 +0,0 @@
-using HighWayIot.Repository.domain;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HighWayIot.Repository.service
-{
-    public interface IBaseDeviceinfoService
-    {
-        /// <summary>
-        /// 根据工序编号获取设备集合
-        /// </summary>
-        /// <param name="ProcessId"></param>
-        /// <returns></returns>
-        List<BaseDeviceinfo> GetDeviceInfoListByProcessId(int ProcessId);
-
-    }
-}

HighWayIot.Repository/service/IBaseSpaceInfoService.cs

@@ -0,0 +1,29 @@
+using HighWayIot.Repository.domain;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HighWayIot.Repository.service
+{
+    /// <summary>
+    /// 货道信息业务接口
+    /// </summary>
+    public interface IBaseSpaceInfoService
+    {
+        /// <summary>
+        /// 通过物料类型获取指定货道，如果没有对应类型的货道返回空白类型的货道
+        /// </summary>
+        /// <param name="materialType"></param>
+        /// <returns></returns>
+        List<BaseSpaceInfo> GetSpaceInfoByMaterialType(string materialType);
+
+        /// <summary>
+        /// 更新货道信息
+        /// </summary>
+        /// <param name="spaceInfo"></param>
+        /// <returns></returns>
+        bool UpdateSpaceInf(BaseSpaceInfo spaceInfo);
+    }
+}

HighWayIot.Repository/service/Impl/BaseDeviceinfoServiceImpl.cs

@@ -1,23 +0,0 @@
-using HighWayIot.Repository.domain;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HighWayIot.Repository.service.Impl
-{
-    public class BaseDeviceinfoServiceImpl : IBaseDeviceinfoService
-    {
-        Repository<BaseDeviceinfo> _deviceInfoRepository => new Repository<BaseDeviceinfo>("sqlite");
-
-
-        public List<BaseDeviceinfo> GetDeviceInfoListByProcessId(int ProcessId)
-        {
-            Expression<Func<BaseDeviceinfo, bool>> exp = s1 => s1.ProcessId == ProcessId;
-            List<BaseDeviceinfo> deviceinfos = _deviceInfoRepository.GetList(exp);
-            return deviceinfos;
-        }
-    }
-}

HighWayIot.sln

@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Mqtt", "HighWayI
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aucma.Scada.UI", "Aucma.Scada.UI\Aucma.Scada.UI.csproj", "{43123E0B-B3B0-4FB4-A508-007D644B3E7C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Config", "HighWayIot.Config\HighWayIot.Config.csproj", "{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +65,10 @@ Global
 		{43123E0B-B3B0-4FB4-A508-007D644B3E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43123E0B-B3B0-4FB4-A508-007D644B3E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43123E0B-B3B0-4FB4-A508-007D644B3E7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75180EE5-13AE-499B-B0F6-C7BFEE1140CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE