liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change.

Browse Source
dev
liuwf 1 year ago
parent d496f0adce
commit 2cdeceb38d
3 changed files with 183 additions and 66 deletions
Show Stats Download Patch File Download Diff File

57
Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs
Unescape Escape View File

@ -0,0 +1,57 @@
using Admin.Core.IService;
using Admin.Core.Model.Model_New;
using Admin.Core.Service;
using Aucma.Core.OldBoxFoam;
using Aucma.Core.OldBoxFoam.Models;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace Aucma.Core.BoxFoam.ViewModels
{
public partial class RoadKindPageViewModel : ObservableObject
{
protected readonly IBoxFoamPlanServices? _boxFoamPlanServices;
protected IOldBoxFoamTypeServices? _boxFoamTypeServices;
public RoadKindPageViewModel()
{
_boxFoamPlanServices = App.ServiceProvider.GetService<IBoxFoamPlanServices>();
_boxFoamTypeServices = App.ServiceProvider.GetService<IOldBoxFoamTypeServices>();
InitData();
}
public async void InitData()
{
List<OldBoxFoamType> list = await _boxFoamTypeServices.QueryAsync();
foreach(OldBoxFoamType item in list)
{
OldBoxFoamTypeModel model= new OldBoxFoamTypeModel();
model.MaterialCode = item.MaterialCode;
model.Status = "1";
Shapes.Add(model);
}
}
#region 初始化
private ObservableCollection<OldBoxFoamTypeModel> _shapes = new ObservableCollection<OldBoxFoamTypeModel>();
public ObservableCollection<OldBoxFoamTypeModel> Shapes
{
get => _shapes;
set => SetProperty(ref _shapes, value);
}
#endregion
}
}

169
Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml
Unescape Escape View File

@ -122,70 +122,129 @@
</Style> </Style>
</UserControl.Resources> </UserControl.Resources>
<Border x:Name="HeightHelperPanel" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="5"> <Border >
<Grid> <Grid>
<Grid.Resources> <Border BorderBrush="#0288d1" BorderThickness="1" Margin="5">
<Style TargetType="TextBlock"> <Border.Effect>
<Setter Property="VerticalAlignment" Value="Center"/> <DropShadowEffect Color="#1254AB" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
<Setter Property="HorizontalAlignment" Value="Center"/> </Border.Effect>
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontFamily" Value="Microsoft YaHei"/> <ItemsControl Grid.Column="0" ItemsSource="{Binding Shapes}" VerticalAlignment="Center" HorizontalAlignment="Center" >
</Style> <ItemsControl.ItemsPanel>
<Style TargetType="Border"> <!--布局-->
<Setter Property="BorderBrush" Value="#0288d1"/> <ItemsPanelTemplate>
<Setter Property="BorderThickness" Value="1"/> <WrapPanel Orientation="Vertical" VerticalAlignment="Top" ></WrapPanel>
</Style> </ItemsPanelTemplate>
</Grid.Resources> </ItemsControl.ItemsPanel>
<Grid.ColumnDefinitions> <!--控件模板-->
<ColumnDefinition /> <ItemsControl.ItemTemplate>
<ColumnDefinition /> <DataTemplate>
</Grid.ColumnDefinitions> <Control x:Name="ctrl" Width="600" Height="200" VerticalAlignment="Top"></Control>
<Grid Grid.Column="0"> <DataTemplate.Triggers>
<!--根据不同类型选择不同模板-->
<DataTrigger Binding="{Binding Status}" 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> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <RowDefinition Height="*"/>
<RowDefinition Height="12*"/> <RowDefinition Height="3*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border> <Border Grid.Row="0">
<TextBlock Text="白班计划" Foreground="White" FontSize="20" /> <Grid>
</Border> <Grid.ColumnDefinitions>
<DataGrid Grid.Row="1" ItemsSource="{Binding ListItems}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" <ColumnDefinition Width="*"/>
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" <ColumnDefinition Width="6*"/>
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" </Grid.ColumnDefinitions>
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" <Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
> <TextBlock Text="货道" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<DataGrid.Columns> </Border>
<DataGridTextColumn Binding="{Binding Local}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<DataGridTextColumn Binding="{Binding Storeamount}" Header="物料编号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <TextBlock Text="箱体发泡名称" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料名称" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> </Border>
<DataGridTextColumn Binding="{Binding Boxtype}" Header="计划数" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <!--<Border Grid.Column="1" BorderBrush="White" BorderThickness="1">
<DataGridTextColumn Binding="{Binding Boxtype}" Header="操作" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <TextBlock x:Name="spaceCodeText" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</DataGrid.Columns> </Border>-->
</DataGrid>
</Grid> </Grid>
<Grid Grid.Column="1" Margin="5 0 0 0"> </Border>
<Border Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>
<!--<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>-->
<!--<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.5*"/>
<ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>-->
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Grid Grid.Column="1" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="4*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"/> <RowDefinition/>
<RowDefinition Height="12*"/> <RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border> <Border Grid.Column="0" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="夜班计划" Foreground="White" FontSize="20" /> <TextBlock x:Name="spaceCodeText1" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<DataGrid Grid.Row="1" ItemsSource="{Binding ListItems}" ColumnHeaderHeight="35" Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" <Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" <TextBlock x:Name="spaceCodeText2" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" </Border>
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True" <Border Grid.Column="2" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
> <TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<DataGrid.Columns> </Border>
<DataGridTextColumn Binding="{Binding Local}" Header="序号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <Border Grid.Column="0" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
<DataGridTextColumn Binding="{Binding Storeamount}" Header="物料编号" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <TextBlock x:Name="spaceCodeText5" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料名称" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" /> </Border>
<DataGridTextColumn Binding="{Binding Boxtype}" Header="计划数" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <Border Grid.Column="1" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
<DataGridTextColumn Binding="{Binding Boxtype}" Header="操作" Width="3*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/> <TextBlock x:Name="spaceCodeText6" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</DataGrid.Columns> </Border>
</DataGrid> <Border Grid.Column="2" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="0" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText7" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText8" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="2" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid> </Grid>
</Grid>
</Border>
</Grid> </Grid>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Border>
</Grid>
</Border> </Border>
</UserControl> </UserControl>

5
Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Aucma.Core.OldBoxFoam.ViewModels; using Aucma.Core.BoxFoam.ViewModels;
using Aucma.Core.OldBoxFoam.ViewModels;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -24,7 +25,7 @@ namespace Aucma.Core.OldBoxFoam.Views
public RoadKindPageView() public RoadKindPageView()
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = new FoamPlanPageViewModel(); this.DataContext = new RoadKindPageViewModel();
} }
} }
} }

Write Preview
Loading…
Cancel
Save