wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 实时库存样式

Browse Source
collectionStore
wenjy 1 year ago
parent d409a5d1dd
commit a1d7766fff
16 changed files with 12953 additions and 271 deletions
Show Stats Download Patch File Download Diff File

3
Aucma.Scada.Business/InventoryInfoBusiness.cs
Unescape Escape View File

@ -3,6 +3,7 @@ using HighWayIot.Log4net;
using HighWayIot.Repository.service; using HighWayIot.Repository.service;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
namespace Aucma.Scada.Business namespace Aucma.Scada.Business
{ {
@ -69,7 +70,7 @@ namespace Aucma.Scada.Business
List<BaseSpaceInfo> spaceInfos = null; List<BaseSpaceInfo> spaceInfos = null;
try try
{ {
spaceInfos = _spaceInfoService.GetSpaceInfosByStoreCode(storeCode); spaceInfos = _spaceInfoService.GetSpaceInfosByStoreCode(storeCode).OrderBy(x=>x.objId).ToList();
} }
catch (Exception ex) catch (Exception ex)

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

304
Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
Unescape Escape View File

@ -18,141 +18,187 @@
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="内胆库实时库存" FontSize="20" FontWeight="Bold" Foreground="#0288d1"/> <TextBlock Text="内胆库实时库存" FontSize="20" FontWeight="Bold" Foreground="#0288d1"/>
</StackPanel> </StackPanel>
<ItemsControl Grid.Row="1" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" > <Border Grid.Row="1">
<ItemsControl.ItemsPanel> <Grid>
<!--布局--> <Grid.ColumnDefinitions>
<ItemsPanelTemplate> <ColumnDefinition Width="8*"/>
<WrapPanel Orientation="Horizontal"></WrapPanel> <ColumnDefinition Width="4*"/>
</ItemsPanelTemplate> </Grid.ColumnDefinitions>
</ItemsControl.ItemsPanel> <Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
<!--控件模板--> <Border.Effect>
<ItemsControl.ItemTemplate> <DropShadowEffect Color="#1254AB" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
<DataTemplate> </Border.Effect>
<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="#0288d1" BorderBrush="White" BorderThickness="2" >
<Grid Margin="3,3">
<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 onRouteAmount}" 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="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="2"> <ItemsControl Grid.Column="0" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Grid> <ItemsControl.ItemsPanel>
<Grid.ColumnDefinitions> <!--布局-->
<ColumnDefinition/> <ItemsPanelTemplate>
<ColumnDefinition/> <WrapPanel Orientation="Vertical"></WrapPanel>
<ColumnDefinition/> </ItemsPanelTemplate>
<ColumnDefinition/> </ItemsControl.ItemsPanel>
<ColumnDefinition/> <!--控件模板-->
<ColumnDefinition/> <ItemsControl.ItemTemplate>
<ColumnDefinition/> <DataTemplate>
</Grid.ColumnDefinitions> <Control x:Name="ctrl" Width="450" Height="200" ></Control>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" > <DataTemplate.Triggers>
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <!--根据不同类型选择不同模板-->
</Border> <DataTrigger Binding="{Binding spaceType}" Value="1">
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1"> <!--矩形-->
<Button Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Setter Property="Template" TargetName="ctrl">
<TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" /> <Setter.Value>
</Button> <ControlTemplate >
<Border Margin="5,5" Background="#0288d1" BorderBrush="White" BorderThickness="2" >
<Grid Margin="3,3">
<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 onRouteAmount}" 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="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
</Border> <Border Grid.Row="2">
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1"> <Grid>
<Button Command="{Binding DataContext.UpdateOutStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Grid.ColumnDefinitions>
<TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <ColumnDefinition/>
</Button> <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.UpdateInStoreFlagCommand, 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>
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1"> <Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateUnusualFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Button Command="{Binding DataContext.UpdateOutStoreFlagCommand, 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"/> <TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button> </Button>
</Border>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="禁用" Foreground="{Binding spaceStatus,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button>
</Border> </Border>
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1"> <Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Button Command="{Binding DataContext.UpdateUnusualFlagCommand, 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"/> <TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button> </Button>
</Border> </Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1"> <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"> <Button Command="{Binding DataContext.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出一个" Foreground="Green" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="禁用" Foreground="{Binding spaceStatus,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Button> </Button>
</Border>
</Grid>
</Border>
</Grid>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
</DataTemplate.Triggers> </Border>
</DataTemplate> <Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.SpaceDetailCommand, 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.OutOnlyOneCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出一个" Foreground="Green" 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> </ItemsControl.ItemTemplate>
</ItemsControl>
</Border>
<Border Grid.Column="1" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
<Border.Effect>
<DropShadowEffect Color="#1254AB" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" 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="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>
</Grid>
</Border>
</Grid>
</Border>
</Grid> </Grid>
</UserControl> </UserControl>

315
Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
Unescape Escape View File

@ -19,141 +19,188 @@
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="箱壳库实时库存" FontSize="20" FontWeight="Bold" Foreground="#0288d1"/> <TextBlock Text="箱壳库实时库存" FontSize="20" FontWeight="Bold" Foreground="#0288d1"/>
</StackPanel> </StackPanel>
<ItemsControl Grid.Row="1" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" > <Border Grid.Row="1">
<ItemsControl.ItemsPanel> <Grid>
<!--布局--> <Grid.ColumnDefinitions>
<ItemsPanelTemplate> <ColumnDefinition Width="8*"/>
<WrapPanel Orientation="Horizontal"></WrapPanel> <ColumnDefinition Width="4*"/>
</ItemsPanelTemplate> </Grid.ColumnDefinitions>
</ItemsControl.ItemsPanel> <Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
<!--控件模板--> <Border.Effect>
<ItemsControl.ItemTemplate> <DropShadowEffect Color="#1254AB" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
<DataTemplate> </Border.Effect>
<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="#0288d1" BorderBrush="White" BorderThickness="2" >
<Grid Margin="3,3">
<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 onRouteAmount}" 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="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="2"> <ItemsControl Grid.Column="0" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
<Grid> <ItemsControl.ItemsPanel>
<Grid.ColumnDefinitions> <!--布局-->
<ColumnDefinition/> <ItemsPanelTemplate>
<ColumnDefinition/> <WrapPanel Orientation="Vertical"></WrapPanel>
<ColumnDefinition/> </ItemsPanelTemplate>
<ColumnDefinition/> </ItemsControl.ItemsPanel>
<ColumnDefinition/> <!--控件模板-->
<ColumnDefinition/> <ItemsControl.ItemTemplate>
<ColumnDefinition/> <DataTemplate>
</Grid.ColumnDefinitions> <Control x:Name="ctrl" Width="450" Height="200" ></Control>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" > <DataTemplate.Triggers>
<TextBlock Text="状态" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <!--根据不同类型选择不同模板-->
</Border> <DataTrigger Binding="{Binding spaceType}" Value="1">
<Border Grid.Column="1" BorderBrush="White" BorderThickness="1"> <!--矩形-->
<Button Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Setter Property="Template" TargetName="ctrl">
<TextBlock Text="入库" Foreground="{Binding inStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" /> <Setter.Value>
</Button> <ControlTemplate >
<Border Margin="5,5" Background="#0288d1" BorderBrush="White" BorderThickness="2" >
</Border> <Grid Margin="3,3">
<Border Grid.Column="2" BorderBrush="White" BorderThickness="1"> <Grid.RowDefinitions>
<Button Command="{Binding DataContext.UpdateOutStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <RowDefinition/>
<TextBlock Text="出库" Foreground="{Binding outStoreFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <RowDefinition/>
</Button> <RowDefinition/>
</Grid.RowDefinitions>
</Border> <Border Grid.Row="0">
<Border Grid.Column="3" BorderBrush="White" BorderThickness="1"> <Grid>
<Button Command="{Binding DataContext.UpdateUnusualFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <Grid.ColumnDefinitions>
<TextBlock Text="异常" Foreground="{Binding unusualFlag,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <ColumnDefinition/>
</Button> <ColumnDefinition/>
</Border> <ColumnDefinition/>
<Border Grid.Column="4" BorderBrush="White" BorderThickness="1"> <ColumnDefinition/>
<Button Command="{Binding DataContext.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <ColumnDefinition/>
<TextBlock Text="禁用" Foreground="{Binding spaceStatus,Converter={StaticResource StatusLabelConverter}}" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <ColumnDefinition/>
</Button> <ColumnDefinition/>
</Grid.ColumnDefinitions>
</Border> <Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<Border Grid.Column="5" BorderBrush="White" BorderThickness="1"> <TextBlock Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Button Command="{Binding DataContext.SpaceDetailCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> </Border>
<TextBlock Text="明细" FontSize="18" Foreground="Green" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/> <Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
</Button> <TextBlock Text="在库" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Column="6" BorderBrush="White" BorderThickness="1"> <Border Grid.Column="2" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.OutOnlyOneCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent"> <TextBlock Text="{Binding spaceStock}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="出一个" Foreground="Green" FontSize="17" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" /> </Border>
</Button> <Border Grid.Column="3" BorderBrush="White" BorderThickness="1">
</Border> <TextBlock Text="在途" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Grid> </Border>
</Border> <Border Grid.Column="4" BorderBrush="White" BorderThickness="1">
</Grid> <TextBlock Text="{Binding onRouteAmount}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
</ControlTemplate> <Border Grid.Column="5" BorderBrush="White" BorderThickness="1">
</Setter.Value> <TextBlock Text="合计" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Setter> </Border>
</DataTrigger> <Border Grid.Column="6" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding totalAmount}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</DataTemplate.Triggers> </Border>
</DataTemplate> </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="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
</Border>
<Border Grid.Row="2">
</ItemsControl.ItemTemplate> <Grid>
</ItemsControl> <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.UpdateInStoreFlagCommand, 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.UpdateOutStoreFlagCommand, 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.UpdateUnusualFlagCommand, 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.UpdateSpaceStatusCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="禁用" Foreground="{Binding spaceStatus,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.SpaceDetailCommand, 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.OutOnlyOneCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding spaceCode}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="出一个" Foreground="Green" 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>
</Border>
<Border Grid.Column="1" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
<Border.Effect>
<DropShadowEffect Color="#1254AB" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="13*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="货道明细" Foreground="#FFFFFF" FontSize="15"/>
</StackPanel>
<DataGrid Grid.Row="1" ItemsSource="{Binding SpaceDetailDataGrid}" 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="#FFFFFF" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding spaceCode}" Header="货道编号" Width="1*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding materialName}" Header="物料名称" Width="*" IsReadOnly="True"/>
<!--<DataGridTextColumn Binding="{Binding materialType}" Header="物料类型" Width="1*" IsReadOnly="True"/>-->
</DataGrid.Columns>
</DataGrid>
</Grid>
</Border>
</Grid>
</Border>
</Grid> </Grid>
</UserControl> </UserControl>

2
Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
Unescape Escape View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
mc:Ignorable="d" mc:Ignorable="d"
Title="{Binding TitleName}" Height="450" Width="800" Name="window"> Title="{Binding TitleName}" Height="450" Width="800" Name="window" ResizeMode="NoResize" Topmost="True">
<Border Margin="5" Background="White" CornerRadius="10"> <Border Margin="5" Background="White" CornerRadius="10">
<Border.Effect> <Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect> <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

25
Aucma.Scada.UI/bin/Debug/Log/2023-11-15/LogError.html
Unescape Escape View File

@ -218,4 +218,29 @@
异常级别：ERROR <BR> 异常级别：ERROR <BR>
异 常 类：logerror [(null)] <BR> 异 常 类：logerror [(null)] <BR>
【附加信息】 : 日志数据绑定异常<br>【异常类型】：IndexOutOfRangeException <br>【异常信息】：索引超出了数组界限。 <br>【堆栈调用】： 在 System.Collections.Generic.List`1.Insert(Int32 index, T item)<br> 在 System.Collections.ObjectModel.Collection`1.InsertItem(Int32 index, T item)<br> 在 System.Collections.ObjectModel.ObservableCollection`1.InsertItem(Int32 index, T item)<br> 在 System.Collections.ObjectModel.Collection`1.Add(T item)<br> 在 Aucma.Scada.UI.viewModel.OutStoreInfo.OutStoreInfoViewModel.PrintMessageToListBox(String message) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\viewModel\OutStoreInfo\OutStoreInfoViewModel.cs:行号 185 <BR> 【附加信息】 : 日志数据绑定异常<br>【异常类型】：IndexOutOfRangeException <br>【异常信息】：索引超出了数组界限。 <br>【堆栈调用】： 在 System.Collections.Generic.List`1.Insert(Int32 index, T item)<br> 在 System.Collections.ObjectModel.Collection`1.InsertItem(Int32 index, T item)<br> 在 System.Collections.ObjectModel.ObservableCollection`1.InsertItem(Int32 index, T item)<br> 在 System.Collections.ObjectModel.Collection`1.Add(T item)<br> 在 Aucma.Scada.UI.viewModel.OutStoreInfo.OutStoreInfoViewModel.PrintMessageToListBox(String message) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\viewModel\OutStoreInfo\OutStoreInfoViewModel.cs:行号 185 <BR>
<HR Size=1><HR COLOR=red>
异常时间：2023-11-15 11:12:59,966 [1] <BR>
异常级别：ERROR <BR>
异 常 类：logerror [(null)] <BR>
【附加信息】 : 获取货道信息异常<br>【异常类型】：SqlSugarException <br>【异常信息】：中文提示 : 多表查询存在别名不一致,请把OrderBy中的x改成s就可以了，特殊需求可以使用.Select((x,y)=>new{ id=x.id,name=y.name}).MergeTable().Orderby(xxx=>xxx.Id)功能将Select中的多表结果集变成单表，这样就可以不限制别名一样<br>English Message : Join s needs to be the same as OrderBy x <br>【堆栈调用】： 在 SqlSugar.Check.Exception(Boolean isException, String message, String[] args)<br> 在 SqlSugar.QueryBuilder.CheckExpression(Expression expression, String methodName)<br> 在 SqlSugar.QueryableProvider`1._OrderBy(Expression expression, OrderByType type)<br> 在 SqlSugar.QueryableProvider`1.OrderBy(Expression`1 expression, OrderByType type)<br> 在 HighWayIot.Repository.service.Impl.BaseSpaceInfoServiceImpl.GetSpaceInfosByStoreCode(String storeCode) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Repository\service\Impl\BaseSpaceInfoServiceImpl.cs:行号 183 <BR>
<HR Size=1><HR COLOR=red>
异常时间：2023-11-15 11:13:00,422 [1] <BR>
异常级别：ERROR <BR>
异 常 类：logerror [(null)] <BR>
【附加信息】 : 获取货道信息异常<br>【异常类型】：SqlSugarException <br>【异常信息】：中文提示 : 多表查询存在别名不一致,请把OrderBy中的x改成s就可以了，特殊需求可以使用.Select((x,y)=>new{ id=x.id,name=y.name}).MergeTable().Orderby(xxx=>xxx.Id)功能将Select中的多表结果集变成单表，这样就可以不限制别名一样<br>English Message : Join s needs to be the same as OrderBy x <br>【堆栈调用】： 在 SqlSugar.Check.Exception(Boolean isException, String message, String[] args)<br> 在 SqlSugar.QueryBuilder.CheckExpression(Expression expression, String methodName)<br> 在 SqlSugar.QueryableProvider`1._OrderBy(Expression expression, OrderByType type)<br> 在 SqlSugar.QueryableProvider`1.OrderBy(Expression`1 expression, OrderByType type)<br> 在 HighWayIot.Repository.service.Impl.BaseSpaceInfoServiceImpl.GetSpaceInfosByStoreCode(String storeCode) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Repository\service\Impl\BaseSpaceInfoServiceImpl.cs:行号 183 <BR>
<HR Size=1><HR COLOR=red>
异常时间：2023-11-15 11:16:20,590 [8] <BR>
异常级别：ERROR <BR>
异 常 类：logerror [(null)] <BR>
【附加信息】 : 箱壳入库任务下发异常<br>【异常类型】：KeyNotFoundException <br>【异常信息】：给定关键字不在字典中。 <br>【堆栈调用】： 在 System.Collections.Generic.Dictionary`2.get_Item(TKey key)<br> 在 Aucma.Scada.Business.InStoreTaskHandle.SendShellTask_InStore(RealTaskInfo taskInfo) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\InStoreTaskHandle.cs:行号 94 <BR>
<HR Size=1><HR COLOR=red>
异常时间：2023-11-15 11:16:22,634 [8] <BR>
异常级别：ERROR <BR>
异 常 类：logerror [(null)] <BR>
【附加信息】 : 箱壳入库任务下发异常<br>【异常类型】：KeyNotFoundException <br>【异常信息】：给定关键字不在字典中。 <br>【堆栈调用】： 在 System.Collections.Generic.Dictionary`2.get_Item(TKey key)<br> 在 Aucma.Scada.Business.InStoreTaskHandle.SendShellTask_InStore(RealTaskInfo taskInfo) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\InStoreTaskHandle.cs:行号 94 <BR>
<HR Size=1><HR COLOR=red>
异常时间：2023-11-15 11:16:24,668 [8] <BR>
异常级别：ERROR <BR>
异 常 类：logerror [(null)] <BR>
【附加信息】 : 箱壳入库任务下发异常<br>【异常类型】：KeyNotFoundException <br>【异常信息】：给定关键字不在字典中。 <br>【堆栈调用】： 在 System.Collections.Generic.Dictionary`2.get_Item(TKey key)<br> 在 Aucma.Scada.Business.InStoreTaskHandle.SendShellTask_InStore(RealTaskInfo taskInfo) <strong style="color:red">位置</strong> E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\InStoreTaskHandle.cs:行号 94 <BR>
<HR Size=1> <HR Size=1>

11592
Aucma.Scada.UI/bin/Debug/Log/2023-11-15/LogInfo.txt
View File

File diff suppressed because one or more lines are too long

192
Aucma.Scada.UI/bin/Debug/Log/2023-11-15/PlcLog.txt
Unescape Escape View File

@ -110,4 +110,196 @@
日志时间：2023-11-15 09:23:24,432 [1] 日志时间：2023-11-15 09:23:24,432 [1]
日志级别：INFO 日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！ 日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:27:02,215 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:27:04,268 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:27:04,269 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:27:06,286 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:31:38,381 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:31:40,446 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:31:40,446 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:31:42,474 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:41:19,024 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:41:21,049 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:41:21,049 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:41:23,086 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:42:28,773 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:42:30,817 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:42:30,821 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:42:32,853 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:43:29,891 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:43:31,935 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:43:31,936 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:43:33,958 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:44:40,841 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:44:42,887 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 09:44:42,887 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 09:44:44,910 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 10:16:52,785 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 10:16:54,867 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 10:16:54,867 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 10:16:56,903 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:03:40,127 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:03:42,179 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:03:42,180 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:03:44,219 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:10:10,267 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:10:12,323 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:10:12,324 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:10:14,366 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:12:44,002 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:12:46,088 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:12:46,088 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:12:48,128 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:14:34,266 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:14:36,333 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:14:36,333 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:14:38,373 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:15:08,109 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:15:10,160 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-15 11:15:10,160 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-15 11:15:12,181 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！

722
Aucma.Scada.UI/bin/Debug/Log/2023-11-15/SqlLog.txt
View File

File diff suppressed because one or more lines are too long

32
Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs
Unescape Escape View File

@ -5,6 +5,7 @@ using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using HighWayIot.Config; using HighWayIot.Config;
using System; using System;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows; using System.Windows;
@ -58,6 +59,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
get { return _shapes; } get { return _shapes; }
set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); } set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); }
} }
private ObservableCollection<BaseSpaceDetail> spaceDetailDataGrid;
public ObservableCollection<BaseSpaceDetail> SpaceDetailDataGrid
{
get { return spaceDetailDataGrid; }
set { spaceDetailDataGrid = value; RaisePropertyChanged(() => SpaceDetailDataGrid); }
}
#endregion #endregion
#region 事件定义 #region 事件定义
@ -201,10 +211,26 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
private void SpaceDetail(object obj) private void SpaceDetail(object obj)
{ {
string info = obj as string; string info = obj as string;
SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.linerStoreCode, info); var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.linerStoreCode, info);
spaceDetailWindow.Show();
RefreshSpaceDetails(list);
}
inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.linerStoreCode, info); /// <summary>
/// 刷新货道明细列表
/// </summary>
/// <param name="spaceDetails"></param>
private void RefreshSpaceDetails(List<BaseSpaceDetail> spaceDetails)
{
SpaceDetailDataGrid = new ObservableCollection<BaseSpaceDetail>();
if (spaceDetails != null)
{
spaceDetails.ForEach(
arg =>
{
SpaceDetailDataGrid.Add(arg);
});
}
} }
/// <summary> /// <summary>

37
Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs
Unescape Escape View File

@ -5,6 +5,7 @@ using GalaSoft.MvvmLight;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using HighWayIot.Config; using HighWayIot.Config;
using System; using System;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows; using System.Windows;
@ -59,6 +60,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
get { return _shapes; } get { return _shapes; }
set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); } set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); }
} }
private ObservableCollection<BaseSpaceDetail> spaceDetailDataGrid;
public ObservableCollection<BaseSpaceDetail> SpaceDetailDataGrid
{
get { return spaceDetailDataGrid; }
set { spaceDetailDataGrid = value; RaisePropertyChanged(() => SpaceDetailDataGrid); }
}
#endregion #endregion
#region 事件定义 #region 事件定义
@ -204,10 +214,31 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
private void SpaceDetail(object obj) private void SpaceDetail(object obj)
{ {
string info = obj as string; string info = obj as string;
SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info); //SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info);
spaceDetailWindow.Show(); //spaceDetailWindow.Show();
//inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info);
inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info); var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.shellStoreCode, info);
RefreshSpaceDetails(list);
}
/// <summary>
/// 刷新货道明细列表
/// </summary>
/// <param name="spaceDetails"></param>
private void RefreshSpaceDetails(List<BaseSpaceDetail> spaceDetails)
{
SpaceDetailDataGrid = new ObservableCollection<BaseSpaceDetail>();
if (spaceDetails != null)
{
spaceDetails.ForEach(
arg =>
{
SpaceDetailDataGrid.Add(arg);
});
}
} }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save