add - 实时库存界面设计

foamRearStore
wenjy 1 year ago
parent b5f0c6dcb4
commit dca60940bf

Binary file not shown.

@ -91,6 +91,8 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Converter\LinerInventory\StatusLabelConverter.cs" />
<Compile Include="Converter\ShellInventory\StatusLabelConverter.cs" />
<Compile Include="IndexControl.xaml.cs">
<DependentUpon>IndexControl.xaml</DependentUpon>
</Compile>
@ -106,6 +108,15 @@
<Compile Include="Page\InventoryInfo\InventoryInfoControl.xaml.cs">
<DependentUpon>InventoryInfoControl.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\LinerInventory.xaml.cs">
<DependentUpon>LinerInventory.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\ShellInventory.xaml.cs">
<DependentUpon>ShellInventory.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\SpaceInfoControl.xaml.cs">
<DependentUpon>SpaceInfoControl.xaml</DependentUpon>
</Compile>
<Compile Include="Page\OutStoreInfo\OutStoreInfoControl.xaml.cs">
<DependentUpon>OutStoreInfoControl.xaml</DependentUpon>
</Compile>
@ -116,9 +127,12 @@
<DependentUpon>RecordControl.xaml</DependentUpon>
</Compile>
<Compile Include="viewModel\InStoreInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfoViewModel.cs" />
<Compile Include="viewModel\LinerInventoryViewModel.cs" />
<Compile Include="viewModel\LogInfoViewModel.cs" />
<Compile Include="viewModel\MainViewModel.cs" />
<Compile Include="viewModel\RecordViewModel.cs" />
<Compile Include="viewModel\ShellInventoryViewModel.cs" />
<Page Include="IndexControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -151,6 +165,18 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\InventoryInfo\LinerInventory.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\InventoryInfo\ShellInventory.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\InventoryInfo\SpaceInfoControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\OutStoreInfo\OutStoreInfoControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@ -199,6 +225,10 @@
<Resource Include="templates\icon\Icon.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HighWayIot.Common\HighWayIot.Common.csproj">
<Project>{89a1edd9-d79e-468d-b6d3-7d07b8843562}</Project>
<Name>HighWayIot.Common</Name>
</ProjectReference>
<ProjectReference Include="..\HighWayIot.Log4net\HighWayIot.Log4net.csproj">
<Project>{deabc30c-ec6f-472e-bd67-d65702fdaf74}</Project>
<Name>HighWayIot.Log4net</Name>
@ -211,5 +241,6 @@
<ItemGroup>
<Resource Include="Icon.png" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

@ -0,0 +1,42 @@
using HighWayIot.Common;
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.LinerInventory
{
public class StatusLabelConverter : IValueConverter
{
private StringChange stringChange = StringChange.Instance;
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if(value == null)
{
return false;
}
else
{
int info = (int)value;
if (info == 1)
{
return "green";
}
else
{
return "red";
}
}
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

@ -0,0 +1,42 @@
using HighWayIot.Common;
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.ShellInventory
{
public class StatusLabelConverter : IValueConverter
{
private StringChange stringChange = StringChange.Instance;
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if(value == null)
{
return false;
}
else
{
int info = (int)value;
if (info == 1)
{
return "green";
}
else
{
return "red";
}
}
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

@ -5,12 +5,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI"
mc:Ignorable="d"
Title="SCADA" Height="1080" Width="1920" Icon="Icon.png"
Title="SCADA" Height="1080" Width="1920" Icon="Icon.png"
WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="False"
>
<!--WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize"Topmost="True"-->
<Border Margin="5" Background="White" CornerRadius="10">
<Border Margin="5" Background="#0D306E" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
@ -168,7 +168,7 @@
</Ellipse>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="箱壳扫码器" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
<TextBlock Text="箱壳扫码器" FontSize="15" Foreground="White" Margin="2,0,10,0"/>
</StackPanel>
</Grid>
</StackPanel>
@ -199,7 +199,7 @@
</Ellipse>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="内胆扫码器" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
<TextBlock Text="内胆扫码器" FontSize="15" Foreground="White" Margin="2,0,10,0"/>
</StackPanel>
</Grid>
</StackPanel>
@ -230,7 +230,7 @@
</Ellipse>
</StackPanel>
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<TextBlock Text="PLC状态" FontSize="15" Foreground="Black" Margin="2,0,10,0"/>
<TextBlock Text="PLC状态" FontSize="15" Foreground="White" Margin="2,0,10,0"/>
</StackPanel>
</Grid>
</StackPanel>

@ -37,18 +37,18 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="箱壳物料条码:" FontSize="15" Foreground="Black"/>
<TextBox FontSize="15" Text="{Binding ShellMaterialCode}" Foreground="Black" Width="200" IsReadOnly="True"/>
<TextBlock Text="箱壳物料条码:" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding ShellMaterialCode}" Foreground="White" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="箱壳物料名称:" FontSize="15" Foreground="Black"/>
<TextBox FontSize="15" Text="{Binding ShellMaterialName}" Foreground="Black" Width="200" IsReadOnly="True"/>
<TextBlock Text="箱壳物料名称:" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding ShellMaterialName}" Foreground="White" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="箱壳入库货道:" FontSize="15" Foreground="Black"/>
<TextBox FontSize="15" Text="{Binding ShellSpaceName}" Foreground="Black" Width="200" IsReadOnly="True"/>
<TextBlock Text="箱壳入库货道:" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding ShellSpaceName}" Foreground="White" Width="200" IsReadOnly="True"/>
</StackPanel>
</Grid>
</Border>
@ -64,18 +64,18 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="内胆物料条码:" FontSize="15" Foreground="Black"/>
<TextBox FontSize="15" Text="{Binding LinerMaterialCode}" Foreground="Black" Width="200" IsReadOnly="True"/>
<TextBlock Text="内胆物料条码:" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding LinerMaterialCode}" Foreground="White" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="内胆物料名称:" FontSize="15" Foreground="Black"/>
<TextBox FontSize="15" Text="{Binding LinerMaterialName}" Foreground="Black" Width="200" IsReadOnly="True"/>
<TextBlock Text="内胆物料名称:" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding LinerMaterialName}" Foreground="White" Width="200" IsReadOnly="True"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="内胆入库货道:" FontSize="15" Foreground="Black"/>
<TextBox FontSize="15" Text="{Binding LinerSpaceName}" Foreground="Black" Width="200" IsReadOnly="True"/>
<TextBlock Text="内胆入库货道:" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding LinerSpaceName}" Foreground="White" Width="200" IsReadOnly="True"/>
</StackPanel>
</Grid>
</Border>
@ -105,13 +105,13 @@
<RowDefinition Height="*"/>
<RowDefinition Height="6*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="Red" BorderThickness="0,0,0,1">
<Border Grid.Row="0" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20,0,0,0">
<TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="Black" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="Black" VerticalAlignment="Center" FontSize="15"/>
<TextBlock Text="物料条码" VerticalAlignment="Center" Foreground="White" FontSize="15"/>
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding Search}" Foreground="White" VerticalAlignment="Center" FontSize="15"/>
<!--resourceStyle 413行修改边框颜色-->
<TextBlock Text="物料类型" VerticalAlignment="Center" Foreground="Black" FontSize="15" Margin="20,0,0,0"/>
<TextBlock Text="物料类型" VerticalAlignment="Center" Foreground="White" FontSize="15" Margin="20,0,0,0"/>
<ComboBox Text="{Binding MaterialTypeCombox}" Width="200" Height="25" Margin="10 0 0 0" Foreground="Black" VerticalAlignment="Center" FontSize="15">
<ComboBoxItem Content="所有" IsSelected="True"/>
<ComboBoxItem Content="箱壳" />
@ -127,7 +127,7 @@
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="Black" >
Foreground="White" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding userId}" Header="物料条码" Width="100" IsReadOnly="True"/>
@ -142,7 +142,7 @@
</Border>
<!--日志信息-->
<Border Grid.Row="1" Grid.Column="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Background="Transparent" BorderBrush="CornflowerBlue" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
<ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground="White" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
</Border>
</Grid>
</UserControl>

@ -5,8 +5,19 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
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="shellInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=shellInventory}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#009999" BorderBrush="#FF36B5C1" Margin="10,0,10,0"/>
<Button Content="内胆库" x:Name="linerInventory" Command="{Binding InventoryOnClickCommand}" CommandParameter="{Binding Name,ElementName=linerInventory}" 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="1" CornerRadius="5" Background="Transparent" Margin="2,2">
<ContentControl Content="{Binding InventoryControl}"/>
</Border>
</Grid>
</UserControl>

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

@ -0,0 +1,158 @@
<UserControl x:Class="Aucma.Scada.UI.Page.InventoryInfo.LinerInventory"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.LinerInventory"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Control.Resources>
<local1:StatusLabelConverter x:Key="StatusLabelConverter" />
</Control.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="12*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="内胆库实时库存" FontSize="20" FontWeight="Bold" Foreground="White"/>
</StackPanel>
<ItemsControl Grid.Row="1" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
<ItemsControl.ItemsPanel>
<!--布局-->
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal"></WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<!--控件模板-->
<ItemsControl.ItemTemplate>
<DataTemplate>
<Control x:Name="ctrl" Width="450" Height="200" ></Control>
<DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding spaceType}" Value="1">
<!--矩形-->
<Setter Property="Template" TargetName="ctrl">
<Setter.Value>
<ControlTemplate >
<Border Margin="5,5" Background="Transparent" BorderBrush="White" BorderThickness="2" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="在库" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceStock}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<TextBlock Text="在途" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding onTheWay}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<TextBlock Text="合计" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding totalAmount}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="型号" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="8307501015SC-349雪王爱喝水" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="禁用" Foreground="{Binding isFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出一个" Foreground="{Binding onlyOne,Converter={StaticResource StatusLabelConverter}}" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
</Grid>
</Border>
</Grid>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</UserControl>

@ -0,0 +1,32 @@
using Aucma.Scada.UI.viewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{
/// <summary>
/// LinerInventory.xaml 的交互逻辑
/// </summary>
public partial class LinerInventory : UserControl
{
public LinerInventory()
{
InitializeComponent();
LinerInventoryViewModel linerInventoryViewModel = new LinerInventoryViewModel();
this.DataContext = linerInventoryViewModel;
}
}
}

@ -0,0 +1,159 @@
<UserControl x:Class="Aucma.Scada.UI.Page.InventoryInfo.ShellInventory"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
<Control.Resources>
<local1:StatusLabelConverter x:Key="StatusLabelConverter" />
</Control.Resources>
<Grid Margin="5,5">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
<RowDefinition Height="12*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="箱壳库实时库存" FontSize="20" FontWeight="Bold" Foreground="White"/>
</StackPanel>
<ItemsControl Grid.Row="1" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
<ItemsControl.ItemsPanel>
<!--布局-->
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal"></WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<!--控件模板-->
<ItemsControl.ItemTemplate>
<DataTemplate>
<Control x:Name="ctrl" Width="450" Height="200" ></Control>
<DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding spaceType}" Value="1">
<!--矩形-->
<Setter Property="Template" TargetName="ctrl">
<Setter.Value>
<ControlTemplate >
<Border Margin="5,5" Background="Transparent" BorderBrush="White" BorderThickness="2" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="在库" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceStock}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<TextBlock Text="在途" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding onTheWay}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<TextBlock Text="合计" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding totalAmount}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="型号" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="8307501015SC-349雪王爱喝水" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="禁用" Foreground="{Binding isFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出一个" Foreground="{Binding onlyOne,Converter={StaticResource StatusLabelConverter}}" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
</Grid>
</Border>
</Grid>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</UserControl>

@ -0,0 +1,32 @@
using Aucma.Scada.UI.viewModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{
/// <summary>
/// ShellInventory.xaml 的交互逻辑
/// </summary>
public partial class ShellInventory : UserControl
{
public ShellInventory()
{
InitializeComponent();
ShellInventoryViewModel shellInventoryViewModel = new ShellInventoryViewModel();
this.DataContext = shellInventoryViewModel;
}
}
}

@ -0,0 +1,116 @@
<UserControl x:Class="Aucma.Scada.UI.Page.InventoryInfo.SpaceInfoControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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.InventoryInfo"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="400">
<Border Margin="5,5" Background="Green" BorderBrush="Blue" BorderThickness="2" CornerRadius="10">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border Grid.Row="0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="在库" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceStock}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<TextBlock Text="在途" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding onTheWay}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<TextBlock Text="合计" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding totalAmount}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="型号" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="8307501015SC-349雪王爱喝水" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding inStoreFlag}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Foreground" Value="Green"/>
<Setter Property="Text" Value="入库"/>
<Style.Triggers>
<Trigger Property="Text" Value="2">
<Setter Property="Foreground" Value="Red"></Setter>
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Border>
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding outStoreFlag}" FontSize="18" Foreground="Red" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding unusualFlag}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding isFlag}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<TextBlock Text="明细" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}">
<TextBlock Text="{Binding onlyOne}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
</Grid>
</Border>
</Grid>
</Border>
</UserControl>

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Aucma.Scada.UI.Page.InventoryInfo
{
/// <summary>
/// SpaceInfoControl.xaml 的交互逻辑
/// </summary>
public partial class SpaceInfoControl : UserControl
{
public SpaceInfoControl()
{
InitializeComponent();
}
}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,293 @@
<-------------->
日志时间2023-09-21 09:14:30,952 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 09:21:46,739 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 09:34:15,856 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:25:37,889 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:28:14,569 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:35:26,214 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:41:14,039 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:46:54,627 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:48:50,996 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:49:54,886 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:50:35,326 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:51:36,179 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:52:22,216 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:54:07,329 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:55:12,716 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 10:56:30,161 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 11:10:34,507 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 11:11:28,419 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 11:12:09,957 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 11:38:22,335 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 13:26:30,410 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 13:36:49,238 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 13:58:42,370 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:08:34,691 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:09:12,367 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:28:54,422 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:30:19,829 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:32:02,783 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:57:59,033 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 14:58:27,423 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:05:05,392 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:06:29,570 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:10:23,624 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:14:44,008 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:15:34,878 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:16:20,760 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:17:35,870 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:18:02,432 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:18:45,436 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:19:54,135 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:20:59,020 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:21:49,850 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:26:24,789 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:28:06,474 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:29:08,188 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:30:19,894 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:31:05,423 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:31:44,911 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:44:20,409 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:45:25,992 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:48:35,088 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:49:37,429 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:52:40,163 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:53:24,504 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:54:35,070 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:55:32,051 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 15:56:19,448 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:05:35,854 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:08:23,759 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:09:29,454 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:10:12,805 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:11:16,743 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:12:00,742 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:17:48,485 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:19:21,307 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:20:03,979 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:21:42,196 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:22:47,542 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:24:00,564 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:24:31,055 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:25:10,253 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:26:18,409 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:28:11,157 [1]
日志级别INFO
日志内容:程序退出

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
f2a00c34321a7be9d7e4c65de29d80152f11353b
e9d589b3c4f464a6a6b80f084d0ef502eed4de54

@ -64,3 +64,11 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveChart
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.xml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
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

@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
10-978130597
132100140106
17-2045347350
1311654442540
IndexControl.xaml;Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
251946362111
1321100521871
IndexControl.xaml;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

@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
10-978130597
132100140106
181495050162
1311654442540
IndexControl.xaml;Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
261191792327
1321100521871
IndexControl.xaml;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

@ -1,4 +1,4 @@

C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\IndexControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
@ -6,6 +6,9 @@ FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InStoreInfo\I
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;;

@ -6,6 +6,9 @@ FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InStoreInfo\I
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;;

@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

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

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

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

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

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "21446F1F04E12092A95892CDE90DFA4E0A6B61468F240AE10684F164BFDEDB4B"
#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6A55CBF2628CDCC879F1C2CA6DC966FD22A94F6297C7C9E1BC0CC93B2D8F0316"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@ -40,6 +40,22 @@ namespace Aucma.Scada.UI.Page.InventoryInfo {
/// </summary>
public partial class InventoryInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 15 "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button shellInventory;
#line default
#line hidden
#line 16 "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button linerInventory;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
@ -68,6 +84,15 @@ namespace Aucma.Scada.UI.Page.InventoryInfo {
[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.shellInventory = ((System.Windows.Controls.Button)(target));
return;
case 2:
this.linerInventory = ((System.Windows.Controls.Button)(target));
return;
}
this._contentLoaded = true;
}
}

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "21446F1F04E12092A95892CDE90DFA4E0A6B61468F240AE10684F164BFDEDB4B"
#pragma checksum "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6A55CBF2628CDCC879F1C2CA6DC966FD22A94F6297C7C9E1BC0CC93B2D8F0316"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@ -40,6 +40,22 @@ namespace Aucma.Scada.UI.Page.InventoryInfo {
/// </summary>
public partial class InventoryInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 15 "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button shellInventory;
#line default
#line hidden
#line 16 "..\..\..\..\Page\InventoryInfo\InventoryInfoControl.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button linerInventory;
#line default
#line hidden
private bool _contentLoaded;
/// <summary>
@ -68,6 +84,15 @@ namespace Aucma.Scada.UI.Page.InventoryInfo {
[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.shellInventory = ((System.Windows.Controls.Button)(target));
return;
case 2:
this.linerInventory = ((System.Windows.Controls.Button)(target));
return;
}
this._contentLoaded = true;
}
}

@ -0,0 +1,76 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CDCEB5F75A9342672B39FEB95788B98034AD71B6C14F17F56F71EE85026FA1EA"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Converter.LinerInventory;
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// LinerInventory
/// </summary>
public partial class LinerInventory : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/linerinventory.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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) {
this._contentLoaded = true;
}
}
}

@ -0,0 +1,76 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CDCEB5F75A9342672B39FEB95788B98034AD71B6C14F17F56F71EE85026FA1EA"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Converter.LinerInventory;
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// LinerInventory
/// </summary>
public partial class LinerInventory : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/linerinventory.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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) {
this._contentLoaded = true;
}
}
}

@ -0,0 +1,93 @@
// Updated by XamlIntelliSenseFileGenerator 2023/9/21 9:50:59
#pragma checksum "..\..\..\..\Page\InventoryInfo\SerialControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ED5782A8E384F1D8480EDF355ACA8A27878708D9B6775944571C5C3E03E2E506"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo
{
/// <summary>
/// SerialControl
/// </summary>
public partial class SerialControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector
{
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent()
{
if (_contentLoaded)
{
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/serialcontrol.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\SerialControl.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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)
{
this._contentLoaded = true;
}
internal System.Windows.Controls.GroupBox serialPortConfigPanel;
internal System.Windows.Controls.ComboBox portsComboBox;
internal System.Windows.Controls.ComboBox baudRateComboBox;
internal System.Windows.Controls.ComboBox parityComboBox;
internal System.Windows.Controls.ComboBox dataBitsComboBox;
internal System.Windows.Controls.ComboBox stopBitsComboBox;
internal System.Windows.Controls.ComboBox encodingComboBox;
internal System.Windows.Controls.TextBox txt_rev;
internal System.Windows.Controls.CheckBox cb_enable;
internal System.Windows.Controls.Button openClosePortButton;
internal System.Windows.Controls.Button findPortButton;
}
}

@ -0,0 +1,76 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3504AD405478399001B1774449AB790AC6773878A98A4ED574F4D76F754D9B0C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Converter.ShellInventory;
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// ShellInventory
/// </summary>
public partial class ShellInventory : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/shellinventory.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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) {
this._contentLoaded = true;
}
}
}

@ -0,0 +1,76 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3504AD405478399001B1774449AB790AC6773878A98A4ED574F4D76F754D9B0C"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Converter.ShellInventory;
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// ShellInventory
/// </summary>
public partial class ShellInventory : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/shellinventory.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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) {
this._contentLoaded = true;
}
}
}

@ -0,0 +1,75 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CC95C1D4EE2D0CCB8C55F69673F5B1893327E40CA45EA4BE759940665D8C676"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// SpaceInfoControl
/// </summary>
public partial class SpaceInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/spaceinfocontrol.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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) {
this._contentLoaded = true;
}
}
}

@ -0,0 +1,75 @@
#pragma checksum "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9CC95C1D4EE2D0CCB8C55F69673F5B1893327E40CA45EA4BE759940665D8C676"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.InventoryInfo;
using System;
using System.Diagnostics;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Ink;
using System.Windows.Input;
using System.Windows.Markup;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Media.TextFormatting;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Shell;
namespace Aucma.Scada.UI.Page.InventoryInfo {
/// <summary>
/// SpaceInfoControl
/// </summary>
public partial class SpaceInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
private bool _contentLoaded;
/// <summary>
/// InitializeComponent
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
public void InitializeComponent() {
if (_contentLoaded) {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/page/inventoryinfo/spaceinfocontrol.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Page\InventoryInfo\SpaceInfoControl.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
#line default
#line hidden
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[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) {
this._contentLoaded = true;
}
}
}

@ -131,7 +131,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border Name="bdr" CornerRadius="3" Opacity="0.5" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
<Border Name="bdr" CornerRadius="3" Opacity="1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
<!--可使用ContentPresenter代替-->
<!--Foreground的值White可以替换为{TemplateBinding Foreground}-->
<Label VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Foreground="White" Content="{TemplateBinding Content}"/>
@ -141,14 +141,14 @@
<Trigger.EnterActions>
<BeginStoryboard >
<Storyboard>
<DoubleAnimation To="0.9" Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
<DoubleAnimation To="0.6" Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
</Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard >
<Storyboard>
<DoubleAnimation To="0.6" Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
<DoubleAnimation To="1" Duration="0:0:0.2" Storyboard.TargetName="bdr" Storyboard.TargetProperty="Opacity" />
</Storyboard>
</BeginStoryboard>
</Trigger.ExitActions>
@ -409,7 +409,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Border BorderThickness="1" Width="auto" Height="auto" BorderBrush="Black">
<Border BorderThickness="1" Width="auto" Height="auto" BorderBrush="CadetBlue">
<Grid x:Name="grid" Background="Transparent">
<ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Center"/>
</Grid>

@ -24,13 +24,18 @@ namespace Aucma.Scada.UI.viewModel
public InStoreInfoViewModel()
{
PrintMessageToListBox("日志信息打印");
Query();
QueryCommand = new RelayCommand(Query);
ResetCommand = new RelayCommand(Reset);
PrintMessageToListBox("日志信息打印");
materialTypeCombox = "所有";
Init();
Query();
}
#region 参数定义
@ -184,34 +189,12 @@ namespace Aucma.Scada.UI.viewModel
/// <summary>
/// 查询事件
/// </summary>
private RelayCommand _queryCommand;
public RelayCommand QueryCommand
{
get
{
if (_queryCommand == null)
_queryCommand = new RelayCommand(Query);
return _queryCommand;
}
set { _queryCommand = value; RaisePropertyChanged(nameof(QueryCommand)); }
}
public RelayCommand QueryCommand { get; set; }
/// <summary>
/// 重置
/// </summary>
private RelayCommand _resetCommand;
public RelayCommand ResetCommand
{
get
{
if (_resetCommand == null)
_resetCommand = new RelayCommand(Reset);
return _resetCommand;
}
set { _resetCommand = value; RaisePropertyChanged(nameof(ResetCommand)); }
}
public RelayCommand ResetCommand { get; set; }
#endregion
/// <summary>
@ -276,7 +259,7 @@ namespace Aucma.Scada.UI.viewModel
/// <summary>
/// 成绩初始化
/// 柱状体加载
/// </summary>
public void Init()
{

@ -0,0 +1,80 @@
using Aucma.Scada.UI.Page.InventoryInfo;
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using HighWayIot.Log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.UI.viewModel
{
public class InventoryInfoViewModel:ViewModelBase
{
private LogHelper logHelper = LogHelper.Instance;
private ShellInventory shellInventory = new ShellInventory();
private LinerInventory linerInventory = new LinerInventory();
public InventoryInfoViewModel()
{
InventoryOnClickCommand = new RelayCommand<object>(obj => InventoryOnClick(obj));
InventoryControl = shellInventory;
}
#region 参数定义
public System.Windows.Controls.UserControl _content;
public System.Windows.Controls.UserControl InventoryControl
{
get { return _content; }
set
{
_content = value;
RaisePropertyChanged(nameof(InventoryControl));
}
}
#endregion
#region 事件定义
/// <summary>
/// 界面跳转按钮事件
/// </summary>
public RelayCommand<object> InventoryOnClickCommand { get; set; }
#endregion
/// <summary>
/// 逻辑实现
/// </summary>
private void InventoryOnClick(object obj)
{
try
{
string info = obj as string;
switch (info)
{
case "shellInventory":
InventoryControl = shellInventory;
break;
case "linerInventory":
InventoryControl = linerInventory;
break;
default:
InventoryControl = shellInventory;
break;
}
}
catch (Exception ex)
{
logHelper.Error("界面跳转逻辑异常", ex);
}
}
}
}

@ -0,0 +1,55 @@
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace Aucma.Scada.UI.viewModel
{
public class LinerInventoryViewModel :ViewModelBase
{
public List<SpaceDto> Shapes { get; set; } = new List<SpaceDto>();
public LinerInventoryViewModel()
{
UpdateCommand = new RelayCommand<object>(obj => update(obj));
for (int i = 1; i <= 6; i++)
{
Shapes.Add(new SpaceDto()
{
spaceCode = i + "#",
spaceStock = i,
onTheWay = i,
totalAmount = i + i,
materialType = "",
inStoreFlag = 1,
outStoreFlag = 2,
unusualFlag = 2,
isFlag = 1,
onlyOne = 1,
spaceType = 1
});
}
}
#region 事件定义
/// <summary>
/// 界面跳转按钮事件
/// </summary>
public RelayCommand<object> UpdateCommand { get; set; }
#endregion
private void update(object obj)
{
string info = obj as string;
MessageBox.Show("编号:" + info);
}
}
}

@ -13,6 +13,15 @@ namespace Aucma.Scada.UI.viewModel
public class LogInfoViewModel : ViewModelBase
{
private LogHelper logHelper = LogHelper.Instance;
private ObservableCollection<dynamic> listItems = new ObservableCollection<dynamic>();
public LogInfoViewModel()
{
PrintMessageToListBox("打印日志");
}
#region 参数定义
private IEnumerable listBoxData;
/// <summary>
/// LisBox数据模板
@ -23,12 +32,7 @@ namespace Aucma.Scada.UI.viewModel
set { listBoxData = value; RaisePropertyChanged(() => ListBoxData); }
}
private ObservableCollection<dynamic> listItems = new ObservableCollection<dynamic>();
public LogInfoViewModel()
{
PrintMessageToListBox("打印日志");
}
#endregion
/// <summary>
/// listBox绑定日志

@ -28,10 +28,12 @@ namespace Aucma.Scada.UI.viewModel
public MainViewModel()
{
//FormControlCommand = new RelayCommand<object>(obj=> FormControl(obj));
ControlOnClickCommand = new RelayCommand<object>(obj => ControlOnClick(obj));
OpenSystemKeyboardCommand = new RelayCommand(OpenSystemKeyboard);
FormControlCommand = new RelayCommand<object>(obj => FormControl(obj));
//OpenSystemKeyboardCommand = new RelayCommand(OpenSystemKeyboard);
UserContent = inStoreInfoControl;
}
@ -83,21 +85,20 @@ namespace Aucma.Scada.UI.viewModel
/// <summary>
/// 界面跳转按钮事件
/// </summary>
private RelayCommand<object> _controlOnClickCommand;
public RelayCommand<object> ControlOnClickCommand { get; set; }
/// <summary>
/// 打开系统键盘
/// </summary>
public RelayCommand OpenSystemKeyboardCommand { get; set; }
public RelayCommand<object> ControlOnClickCommand
{
get
{
if (_controlOnClickCommand == null)
_controlOnClickCommand = new RelayCommand<object>(obj=> ControlOnClick(obj));
return _controlOnClickCommand;
}
set { _controlOnClickCommand = value; RaisePropertyChanged(nameof(ControlOnClickCommand)); }
}
/// <summary>
/// 窗体控制
/// </summary>
public RelayCommand<object> FormControlCommand { get; set; }
#endregion
/// <summary>
/// 逻辑实现
/// 界面跳转
/// </summary>
private void ControlOnClick(object obj)
{
@ -128,7 +129,8 @@ namespace Aucma.Scada.UI.viewModel
UserContent = inStoreInfoControl;
break;
}
}catch(Exception ex)
}
catch (Exception ex)
{
logHelper.Error("界面跳转逻辑异常", ex);
}
@ -137,54 +139,23 @@ namespace Aucma.Scada.UI.viewModel
/// <summary>
/// 打开系统键盘
/// </summary>
private RelayCommand _openSystemKeyboardCommand;
public RelayCommand OpenSystemKeyboardCommand
{
get
{
if (_openSystemKeyboardCommand == null)
_openSystemKeyboardCommand = new RelayCommand(OpenSystemKeyboard);
return _openSystemKeyboardCommand;
}
set { _openSystemKeyboardCommand = value; RaisePropertyChanged(nameof(OpenSystemKeyboardCommand)); }
}
/// <summary>
/// 逻辑实现
/// </summary>
public void OpenSystemKeyboard()
private void OpenSystemKeyboard()
{
try
{
MessageBox.Show("打开系统键盘");
}catch(Exception ex)
{
logHelper.Error("打开系统键盘逻辑异常", ex);
}
}
/// <summary>
/// 窗体控制
/// </summary>
private RelayCommand<object> _formControlCommand;
public RelayCommand<object> FormControlCommand
{
get
catch (Exception ex)
{
if (_formControlCommand == null)
_formControlCommand = new RelayCommand<object>(obj => FormControl(obj));
return _formControlCommand;
logHelper.Error("打开系统键盘逻辑异常", ex);
}
set { _formControlCommand = value; RaisePropertyChanged(nameof(FormControlCommand)); }
}
/// <summary>
/// 逻辑实现
/// 窗体控制
/// </summary>
/// <param name="obj"></param>
public void FormControl(object obj)
private void FormControl(object obj)
{
try
{
@ -218,13 +189,12 @@ namespace Aucma.Scada.UI.viewModel
default:
break;
}
}catch(Exception ex)
}
catch (Exception ex)
{
logHelper.Error("窗体控制逻辑异常", ex);
}
}
#endregion
}
}

@ -20,8 +20,11 @@ namespace Aucma.Scada.UI.viewModel
public RecordViewModel()
{
QueryCommand = new RelayCommand(Query);
ResetCommand = new RelayCommand(Reset);
}
#region 参数定义
private String search = String.Empty;
public String Search
@ -39,25 +42,23 @@ namespace Aucma.Scada.UI.viewModel
set { gridModelList = value; RaisePropertyChanged(); }
}
#endregion
#region 事件定义
/// <summary>
/// 查询事件
/// </summary>
private RelayCommand _queryCommand;
public RelayCommand QueryCommand { get; set; }
public RelayCommand QueryCommand
{
get
{
if (_queryCommand == null)
_queryCommand = new RelayCommand(Query);
return _queryCommand;
}
set { _queryCommand = value; RaisePropertyChanged(nameof(QueryCommand)); }
}
/// <summary>
/// 重置
/// </summary>
public RelayCommand ResetCommand { get; set; }
#endregion
/// <summary>
/// 查询
/// </summary>
public void Query()
{
@ -82,19 +83,6 @@ namespace Aucma.Scada.UI.viewModel
/// <summary>
/// 重置
/// </summary>
private RelayCommand _resetCommand;
public RelayCommand ResetCommand
{
get
{
if (_resetCommand == null)
_resetCommand = new RelayCommand(Reset);
return _resetCommand;
}
set { _resetCommand = value; RaisePropertyChanged(nameof(ResetCommand)); }
}
public void Reset()
{
Search = String.Empty;

@ -0,0 +1,115 @@
using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command;
using System.Collections.Generic;
using System.Windows;
namespace Aucma.Scada.UI.viewModel
{
public class ShellInventoryViewModel : ViewModelBase
{
public List<SpaceDto> Shapes { get; set; } = new List<SpaceDto>();
public ShellInventoryViewModel()
{
UpdateCommand = new RelayCommand<object>(obj => update(obj));
for (int i = 1; i <= 9; i++)
{
Shapes.Add(new SpaceDto()
{
spaceCode = i + "#",
spaceStock = i,
onTheWay = i,
totalAmount = i+i,
materialType = "",
inStoreFlag = 1,
outStoreFlag = 2,
unusualFlag = 2,
isFlag = 1,
onlyOne = 1,
spaceType = 1
});
}
}
#region 事件定义
/// <summary>
/// 界面跳转按钮事件
/// </summary>
public RelayCommand<object> UpdateCommand { get; set; }
#endregion
private void update(object obj)
{
string info = obj as string;
MessageBox.Show("编号:" + info);
}
}
/// <summary>
/// 货道信息
/// </summary>
public class SpaceDto
{
/// <summary>
/// 货道编号
/// </summary>
public string spaceCode { get; set; }
/// <summary>
/// 在库数量
/// </summary>
public int spaceStock { get; set; }
/// <summary>
/// 货道类型
/// </summary>
public int spaceType { get; set; }
/// <summary>
/// 在途数量
/// </summary>
public int onTheWay { get; set; }
/// <summary>
/// 合计数量
/// </summary>
public int totalAmount { get; set; }
/// <summary>
/// 物料型号
/// </summary>
public string materialType { get; set; }
/// <summary>
/// 入库状态
/// </summary>
public int inStoreFlag { get; set; }
/// <summary>
/// 出库状态
/// </summary>
public int outStoreFlag { get; set; }
/// <summary>
/// 异常状态
/// </summary>
public int unusualFlag { get; set; }
/// <summary>
/// 禁用状态
/// </summary>
public int isFlag { get; set; }
/// <summary>
/// 出一个
/// </summary>
public int onlyOne { get; set; }
}
}

@ -60,6 +60,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="domain\BaseBomInfo.cs" />
<Compile Include="domain\BaseSpaceInfo.cs" />
<Compile Include="domain\SysUserInfo.cs" />
<Compile Include="domain\BaseDeviceinfo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

@ -0,0 +1,76 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HighWayIot.Repository.domain
{
/// <summary>
/// 货道信息
/// </summary>
[SugarTable("BASE_BOMINFO")]
public class BaseSpaceInfo
{
/// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true)]
public int objId { get; set; }
/// <summary>
/// 货道编号
/// </summary>
[SugarColumn(ColumnName = "SPACE_CODE")]
public string spaceCode { get; set; }
/// <summary>
/// 货道名称
/// </summary>
[SugarColumn(ColumnName = "SPACE_NAME")]
public string spaceName { get; set; }
/// <summary>
/// 货道容量
/// </summary>
[SugarColumn(ColumnName = "SPACE_CAPACITY")]
public int spaceCapacity { get; set; }
/// <summary>
/// 货道库存
/// </summary>
[SugarColumn(ColumnName = "SPACE_STOCK")]
public int spaceStock { get; set; }
/// <summary>
/// 货道状态
/// </summary>
[SugarColumn(ColumnName = "SPACE_STATUS")]
public int spaceStatus { get; set; }
/// <summary>
/// 货道类型
/// </summary>
[SugarColumn(ColumnName = "SPACE_TYPE")]
public int spaceType { get; set; }
/// <summary>
/// 物料类型
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_TYPE")]
public string materialType { get; set; }
/// <summary>
/// 所属仓库
/// </summary>
[SugarColumn(ColumnName = "STORE_CODE")]
public string storeCode { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int isFlag { get; set; }
}
}

@ -1 +1 @@
66d72757cb56e320728feb774eade2b0ebd7a523
803c746b6ef1bb18415b3fbf3d461e1ea5fd5a81

@ -21,3 +21,4 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\H
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.pdb
C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache

Loading…
Cancel
Save