泡后库入库一个货道设置多种型号

foamRearStore
liuwf 1 year ago
parent 24685e4f86
commit dccb3b59a0

Binary file not shown.

@ -1 +1 @@
dafab2e3d503748c194ae4d54dfa0f3ec2feed3f
0d0ae30db0cb44b31c0ab9092cac8bfadb5631ad

@ -83,3 +83,42 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\D
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll.config
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\log4net.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HslCommunication.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll.config
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete

@ -1 +1 @@
bd39e0a8706b9965359a1d6a036e3c60dc654ba8
62462d30f462e01d406676454f558c2316152f02

@ -15,3 +15,20 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\D
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\log4net.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb

@ -44,6 +44,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="domain\BaseMaterialInfo.cs" />
<Compile Include="domain\MaterialCompletion.cs" />
<Compile Include="domain\PrintBarCode.cs" />
<Compile Include="domain\BaseBomInfo.cs" />

@ -0,0 +1,37 @@
using SqlSugar;
namespace Aucma.Scada.Model.domain
{
[SugarTable("BASE_MATERIALINFO")]
public class BaseMaterialInfo
{
/// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int ObjId { get; set; }
/// <summary>
/// 物料编号
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_CODE")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_NAME")]
public string MaterialName { get; set; }
/// <summary>
/// 物料小类
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_SUBCLASS")]
public string MaterialSubclass { get; set; }
/// <summary>
/// 物料sap类型FERT成品
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_TYPE")]
public string MaterialType { get; set; }
}
}

@ -13,7 +13,7 @@ namespace Aucma.Scada.Model.domain
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int objId { get; set; }
/// <summary>
/// 货道编号
/// </summary>
@ -51,7 +51,7 @@ namespace Aucma.Scada.Model.domain
public int spaceType { get; set; }
/// <summary>
/// 物料类型
/// 物料类型A
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_TYPE")]
public string materialType { get; set; }
@ -97,5 +97,32 @@ namespace Aucma.Scada.Model.domain
/// </summary>
[SugarColumn(ColumnName = "UNUSUAL_FLAG")]
public int unusualFlag { get; set; }
/// <summary>
/// 物料类型B
/// </summary>
[SugarColumn(ColumnName = "TYPE_CODE_B")]
public string typeCodeB { get; set; }
/// <summary>
/// 物料类型C
/// </summary>
[SugarColumn(ColumnName = "TYPE_CODE_C")]
public string typeCodeC { get; set; }
/// <summary>
/// 物料类型(名称)A
/// </summary>
[SugarColumn(ColumnName = "TYPE_NAME_A")]
public string typeNameA { get; set; }
/// <summary>
/// 物料类型(名称)B
/// </summary>
[SugarColumn(ColumnName = "TYPE_NAME_B")]
public string typeNameB { get; set; }
/// <summary>
/// 物料类型(名称)C
/// </summary>
[SugarColumn(ColumnName = "TYPE_NAME_C")]
public string typeNameC { get; set; }
}
}

@ -1 +1 @@
f38bcd2f54993094da876b27284336475995c9e4
936f1a7acc7fd093726a38678830636b5a490d72

@ -6,3 +6,11 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debu
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.AssemblyReference.cache
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb

@ -99,6 +99,7 @@
<Compile Include="Converter\ShellInventory\StatusLabelConverter.cs" />
<Compile Include="Converter\TaskInfo\TaskStatusConverter.cs" />
<Compile Include="Converter\TaskInfo\TaskTypeConverter.cs" />
<Compile Include="Model\typeGridModel.cs" />
<Compile Include="Page\AssemblyPlan\AssemblyPlanControl.xaml.cs">
<DependentUpon>AssemblyPlanControl.xaml</DependentUpon>
</Compile>
@ -123,6 +124,12 @@
<Compile Include="Page\InventoryInfo\InventoryInfoControl.xaml.cs">
<DependentUpon>InventoryInfoControl.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\SelectTypeWindow.xaml.cs">
<DependentUpon>SelectTypeWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\SelectType.xaml.cs">
<DependentUpon>SelectType.xaml</DependentUpon>
</Compile>
<Compile Include="Page\InventoryInfo\LinerInventory.xaml.cs">
<DependentUpon>LinerInventory.xaml</DependentUpon>
</Compile>
@ -152,6 +159,8 @@
<Compile Include="viewModel\AssemblyPlan\QuantityIssuedViewModel.cs" />
<Compile Include="viewModel\AssemblyPlan\SearchCriteriaViewModel.cs" />
<Compile Include="viewModel\InStoreInfo\InStoreInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\SelectTypeWindowViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\SelectTypeViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\BoxFoamRearInventoryViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\InventoryInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\LinerInventoryViewModel.cs" />
@ -207,6 +216,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Page\InventoryInfo\SelectTypeWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page\InventoryInfo\SelectType.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Page\InventoryInfo\LinerInventory.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

@ -7,7 +7,7 @@
WindowStartupLocation="CenterScreen"
mc:Ignorable="d"
Title="SCADA" Height="1080" Width="1920" Icon="Icon.png"
WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="True">
WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize">
<Window.Background>
<ImageBrush ImageSource="/templates/image/background.jpg" />
</Window.Background>

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.UI.Model
{
public class typeGridModel
{
public int No;
public string MaterialCode;
public string MaterialName;
}
}

@ -114,9 +114,9 @@
<Border Margin="5,5" Background="#0288d1" BorderBrush="White" BorderThickness="2" >
<Grid Margin="3,3">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition Height="*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Border Grid.Row="0">
<Grid>
@ -130,7 +130,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="{Binding spaceCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock x:Name="spaceCodeText" 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"/>
@ -154,15 +154,43 @@
</Border>
<Border Grid.Row="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="2*"/>
<!--<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>-->
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1">
<TextBlock Text="型号" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Border Grid.Column="0" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="型号1" 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.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.SubmitCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
<TextBlock Text="{Binding materialType}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
<Border Grid.Column="0" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="型号2" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" Grid.Row="1" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.SubmitCommand2, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
<TextBlock Text="{Binding typeCodeB}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
<Border Grid.Column="0" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="型号3" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<Border Grid.Column="1" Grid.Row="2" BorderBrush="White" BorderThickness="1">
<Button Command="{Binding DataContext.SubmitCommand3, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding Text, ElementName=spaceCodeText}" Background="Transparent">
<TextBlock Text="{Binding typeCodeC}" FontSize="16" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
</Border>
</Grid>
</Border>

@ -0,0 +1,133 @@
<Window x:Class="Aucma.Scada.UI.Page.InventoryInfo.SelectType"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" FontFamily="Microsoft YaHei"
Name="window" Background="#1254AB" d:DesignHeight="800" d:DesignWidth="1200">
<Window.Resources>
<Style TargetType="{x:Type Slider}">
<Style.Resources>
<!-- 重写重复触发按钮的样式 -->
<Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
<Setter Property="Focusable" Value="false" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Padding" Value="0" />
<Setter Property="Width" Value="30" />
</Style>
</Style.Resources>
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
<Setter Property="SmallChange" Value="1" />
</Style>
</Window.Resources>
<Border Margin="5" Background="#1254AB" CornerRadius="1">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="10*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" Grid.Column="0">
<TextBox Width="200" Height="25" Margin="10 0 0 0" Text="{Binding SearchText}" Foreground="White" VerticalAlignment="Center" FontSize="18"/>
<Button Content="查 询" Command="{Binding QueryCommand}" Background="#007DFA" BorderBrush="#007DFA" VerticalAlignment="Center" Foreground="White" Height="30" Width="100" Margin="0 0 50 0"/>
<Button Content="清除型号" Command="{Binding deleteCommand}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900" VerticalAlignment="Center" Height="30" Width="100" />
</StackPanel>
<!--计划列表-->
<Border Grid.Row="1" Grid.Column="0" BorderBrush="#1254AB" Background="Transparent" BorderThickness="0" CornerRadius="5" Margin="1,1,5,5" >
<DataGrid ItemsSource="{Binding MaterialDataGrid}" Background="Transparent"
FontSize="18" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" SelectedItem="{Binding SelectedDataItem}" SelectionChanged="DataGrid_SelectionChanged">
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding MaterialCode}" Header="产品编码" Width="1*" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="产品名称" Width="2.5*" />
</DataGrid.Columns>
</DataGrid>
</Border>
<Border Grid.Row="1" Grid.Column="1" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="5,5">
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="产品编码:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="MaterialCode" FontSize="20" Text="{Binding PlanInfo.MaterialCode}" Foreground="#FFFFFF" Width="260" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="产品型号:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="MaterialName" FontSize="20" Text="{Binding PlanInfo.MaterialName}" Foreground="#FFFFFF" Width="260" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0" >
<!--单选框样式-->
<StackPanel.Resources>
<Style TargetType="RadioButton">
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="Background" Value="White"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<BulletDecorator Background="Transparent">
<BulletDecorator.Bullet>
<Grid Width="20" Height="20">
<Ellipse x:Name="BulletRadio" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1"/>
</Grid>
</BulletDecorator.Bullet>
<ContentPresenter Margin="4,0,0,0" VerticalAlignment="Center" RecognizesAccessKey="True"/>
</BulletDecorator>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="BulletRadio" Property="Fill" Value="Green"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="Green"/>
</Trigger>
</Style.Triggers>
</Style>
</StackPanel.Resources>
<TextBlock Text="选择型号: " FontSize="20" Foreground="#FFFFFF" />
<RadioButton Content="型号1" GroupName="Direction" IsChecked="{Binding IsSelectedOptionA, Mode=TwoWay}" />
<RadioButton Content="型号2" GroupName="Direction" IsChecked="{Binding IsSelectedOptionB, Mode=TwoWay}" Margin="10 0 0 0"/>
<RadioButton Content="型号3" GroupName="Direction" IsChecked="{Binding IsSelectedOptionC, Mode=TwoWay}" Margin="10 0 0 0"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="保 存" FontSize="20" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
</StackPanel>
</Grid>
</Border>
</Grid>
</Border>
</Window>

@ -0,0 +1,44 @@
using Aucma.Scada.UI.viewModel.AssemblyPlan;
using Aucma.Scada.UI.viewModel.InventoryInfo;
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>
/// SelectType.xaml 的交互逻辑
/// </summary>
public partial class SelectType : Window
{
private SelectTypeViewModel viewModel = null;
public SelectType(int ncount,string spaceCode)
{
InitializeComponent();
viewModel = new SelectTypeViewModel(ncount,spaceCode);
this.DataContext = viewModel;
viewModel.closeEvent += closeWindow;
}
private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
viewModel.MouseClick(sender);
}
private void closeWindow()
{
this.Close();
}
}
}

@ -0,0 +1,91 @@
<Window x:Class="Aucma.Scada.UI.Page.InventoryInfo.SelectTypeWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei"
Title="设置型号" Height="500" Width="500" Name="window" Background="White"
ResizeMode="NoResize" >
<Border Margin="5" Background="#1254AB" CornerRadius="10">
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="5,5">
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="产品编码:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="MaterialCode" FontSize="20" Text="{Binding PlanInfo.MaterialCode}" Foreground="#FFFFFF" Width="260" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
<TextBlock Text="产品型号:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,0,0"/>
<TextBox x:Name="MaterialName" FontSize="20" Text="{Binding PlanInfo.MaterialName}" Foreground="#FFFFFF" Width="260" IsReadOnly="True" Margin="5,0,10,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0" >
<!--单选框样式-->
<StackPanel.Resources>
<Style TargetType="RadioButton">
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="Background" Value="White"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<BulletDecorator Background="Transparent">
<BulletDecorator.Bullet>
<Grid Width="20" Height="20">
<Ellipse x:Name="BulletRadio" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1"/>
</Grid>
</BulletDecorator.Bullet>
<ContentPresenter Margin="4,0,0,0" VerticalAlignment="Center" RecognizesAccessKey="True"/>
</BulletDecorator>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="BulletRadio" Property="Fill" Value="Green"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="Green"/>
</Trigger>
</Style.Triggers>
</Style>
</StackPanel.Resources>
<TextBlock Text="选择型号: " FontSize="20" Foreground="#FFFFFF" />
<RadioButton Content="型号1" GroupName="Direction" IsChecked="{Binding IsSelectedOptionA, Mode=TwoWay}" />
<RadioButton Content="型号2" GroupName="Direction" IsChecked="{Binding IsSelectedOptionB, Mode=TwoWay}" Margin="10 0 0 0"/>
<RadioButton Content="型号3" GroupName="Direction" IsChecked="{Binding IsSelectedOptionC, Mode=TwoWay}" Margin="10 0 0 0"/>
</StackPanel>
<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="保 存" FontSize="20" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
<Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
</StackPanel>
</Grid>
</Border>
</Grid>
</Border>
</Window>

@ -0,0 +1,35 @@
using Aucma.Scada.Model.domain;
using Aucma.Scada.UI.viewModel.AssemblyPlan;
using Aucma.Scada.UI.viewModel.InventoryInfo;
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>
/// SelectType.xaml 的交互逻辑
/// </summary>
public partial class SelectTypeWindow : Window
{
private SelectTypeWindowViewModel viewModel = null;
public SelectTypeWindow(string spaceCode,BaseMaterialInfo info)
{
InitializeComponent();
viewModel = new SelectTypeWindowViewModel(spaceCode,info);
this.DataContext = viewModel;
}
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save