change - 组装计划界面设计

foamRearStore
wenjy 1 year ago
parent dca60940bf
commit 32dfe7e248

Binary file not shown.

@ -93,9 +93,6 @@
</ApplicationDefinition>
<Compile Include="Converter\LinerInventory\StatusLabelConverter.cs" />
<Compile Include="Converter\ShellInventory\StatusLabelConverter.cs" />
<Compile Include="IndexControl.xaml.cs">
<DependentUpon>IndexControl.xaml</DependentUpon>
</Compile>
<Compile Include="Page\AssemblyPlan\AssemblyPlanControl.xaml.cs">
<DependentUpon>AssemblyPlanControl.xaml</DependentUpon>
</Compile>
@ -126,17 +123,14 @@
<Compile Include="RecordControl.xaml.cs">
<DependentUpon>RecordControl.xaml</DependentUpon>
</Compile>
<Compile Include="viewModel\InStoreInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfoViewModel.cs" />
<Compile Include="viewModel\LinerInventoryViewModel.cs" />
<Compile Include="viewModel\AssemblyPlan\AssemblyPlanViewModel.cs" />
<Compile Include="viewModel\InStoreInfo\InStoreInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\InventoryInfoViewModel.cs" />
<Compile Include="viewModel\InventoryInfo\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>
</Page>
<Compile Include="viewModel\InventoryInfo\ShellInventoryViewModel.cs" />
<Page Include="Page\AssemblyPlan\AssemblyPlanControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

@ -1,12 +0,0 @@
<UserControl x:Class="Aucma.Scada.UI.IndexControl"
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"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Background="Red">
<Grid>
</Grid>
</UserControl>

@ -1,28 +0,0 @@
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
{
/// <summary>
/// IndexControl.xaml 的交互逻辑
/// </summary>
public partial class IndexControl : UserControl
{
public IndexControl()
{
InitializeComponent();
}
}
}

@ -4,9 +4,162 @@
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.AssemblyPlan"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
<Grid Margin="5,5">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<!--计划执行-->
<Border Grid.Row="0" Grid.Column="0" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="7*"/>
<ColumnDefinition Width="5*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" BorderBrush="Red" BorderThickness="0" Background="Transparent" CornerRadius="5" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="工位名称" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding StationName}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="订单编号" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding OrderCode}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="计划编号" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding PlanCode}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="3" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="产品型号" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding ProductModel}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
<StackPanel Grid.Row="4" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="开始时间" FontSize="15" Foreground="White"/>
<TextBox FontSize="15" Text="{Binding BeginTime}" Foreground="White" Width="200" IsReadOnly="True" Margin="30,0,0,0"/>
</StackPanel>
</Grid>
</Border>
<Border Grid.Column="1" BorderBrush="Red" BorderThickness="0" Background="Transparent" CornerRadius="5" Margin="0,10,0,0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="4*"/>
<RowDefinition Height="4*"/>
<RowDefinition Height="2*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.Row="0" Grid.Column="0" BorderBrush="White" BorderThickness="1" CornerRadius="5" Margin="0,0,5,5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
</Grid>
</Border>
<Border Grid.Row="0" Grid.Column="1" BorderBrush="White" BorderThickness="1" CornerRadius="5" Margin="5,0,0,5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
</Grid>
</Border>
<Border Grid.Row="1" Grid.Column="0" BorderBrush="White" BorderThickness="1" CornerRadius="5" Margin="0,5,5,0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
</Grid>
</Border>
<Border Grid.Row="1" Grid.Column="1" BorderBrush="White" BorderThickness="1" CornerRadius="5" Margin="5,5,0,0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="2*"/>
<RowDefinition Height="7*"/>
</Grid.RowDefinitions>
</Grid>
</Border>
</Grid>
</Border>
</Grid>
</Border>
<!--日产量-->
<Border Grid.Row="0" Grid.Column="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
</Border>
<!--计划列表-->
<Border Grid.Row="1" Grid.Column="0" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="6*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<DataGrid Grid.Row="0" ItemsSource="{Binding ShellInstoreTask}" Background="Transparent"
FontSize="15" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="White" >
<!--resourceStyle 399行修改选中字体颜色-->
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding userId}" Header="序号" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding userName}" Header="产品型号" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding userName}" Header="计划数量" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding userName}" Header="实际完成" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Binding="{Binding userName}" Header="开始时间" Width="*" IsReadOnly="True"/>
<DataGridTextColumn Header="功能操作" Width="*" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
<Border Grid.Row="1" BorderBrush="CadetBlue" BorderThickness="0,0,0,1">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,20,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="自动" />
</ComboBox>
<Button Content="计划维护" Command="{Binding QueryCommand}" Background="#007DFA" Foreground="White" Margin="20,0,0,0" Height="30" BorderBrush="DeepSkyBlue" BorderThickness="1" Width="80" />
</StackPanel>
</Border>
</Grid>
</Border>
<!--型号统计-->
<Border Grid.Row="1" Grid.Column="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
</Border>
</Grid>
</UserControl>

@ -1,4 +1,5 @@
using System;
using Aucma.Scada.UI.viewModel.AssemblyPlan;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -22,7 +23,11 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan
{
public AssemblyPlanControl()
{
InitializeComponent();
AssemblyPlanViewModel assemblyPlanViewModel = new AssemblyPlanViewModel();
this.DataContext = assemblyPlanViewModel;
}
}
}

@ -1,4 +1,5 @@
using Aucma.Scada.UI.viewModel;
using Aucma.Scada.UI.viewModel.InStoreInfo;
using System;
using System.Collections.Generic;
using System.Linq;

@ -1,4 +1,5 @@
using Aucma.Scada.UI.viewModel;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;

@ -1,4 +1,5 @@
using Aucma.Scada.UI.viewModel;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;

@ -1,4 +1,5 @@
using Aucma.Scada.UI.viewModel;
using Aucma.Scada.UI.viewModel.InventoryInfo;
using System;
using System.Collections.Generic;
using System.Linq;

@ -290,4 +290,64 @@
日志时间2023-09-21 16:28:11,157 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 16:33:31,647 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:01:20,119 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:02:40,760 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:03:47,198 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:04:57,288 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:05:47,717 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:06:27,779 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:14:10,707 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:15:49,232 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:16:29,768 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:17:40,199 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:19:56,119 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:21:07,783 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:32:38,293 [1]
日志级别INFO
日志内容:程序退出
<-------------->
日志时间2023-09-21 17:39:22,471 [1]
日志级别INFO
日志内容:程序退出

@ -1 +1 @@
e9d589b3c4f464a6a6b80f084d0ef502eed4de54
4dd20336a0336e0342e692ff9031d4d65af3e6b2

@ -1,6 +1,5 @@
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\IndexControl.g.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
@ -36,7 +35,6 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\GalaSoft.
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.xml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\App.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\IndexControl.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\MainWindow.baml
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\RecordControl.baml

@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
132100140106
12777446641
251946362111
251141458628
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;
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
132100140106
12777446641
261191792327
26386888844
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;
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,16 +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;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\LogInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\MainWindow.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\RecordControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;

@ -1,6 +1,5 @@

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;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\LogInfoControl.xaml;;

@ -1,75 +0,0 @@
#pragma checksum "..\..\IndexControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ADD1ADBAD0FB398B7FB338057ED14B39EBB57820AF57D89F87F806226B4A55B3"
//------------------------------------------------------------------------------
// <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;
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 {
/// <summary>
/// IndexControl
/// </summary>
public partial class IndexControl : 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/indexcontrol.xaml", System.UriKind.Relative);
#line 1 "..\..\IndexControl.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;
}
}
}

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

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

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "205EA96F6B0A0E7F50E54FD4B7524236DFF94BC86636087D115C232DC2FA5312"
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FC78E8A5AACB9AA643259BE61C90DD50B7827F59EAE509AB950740FE0D6C6AAB"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@ -10,6 +10,7 @@
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.AssemblyPlan;
using LiveCharts.Wpf;
using System;
using System.Diagnostics;
using System.Windows;

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "205EA96F6B0A0E7F50E54FD4B7524236DFF94BC86636087D115C232DC2FA5312"
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FC78E8A5AACB9AA643259BE61C90DD50B7827F59EAE509AB950740FE0D6C6AAB"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@ -10,6 +10,7 @@
//------------------------------------------------------------------------------
using Aucma.Scada.UI.Page.AssemblyPlan;
using LiveCharts.Wpf;
using System;
using System.Diagnostics;
using System.Windows;

@ -0,0 +1,74 @@
using GalaSoft.MvvmLight;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.UI.viewModel.AssemblyPlan
{
public class AssemblyPlanViewModel : ViewModelBase
{
public AssemblyPlanViewModel()
{
stationName = "箱壳内胆组装";
orderCode = System.Guid.NewGuid().ToString();
planCode = System.Guid.NewGuid().ToString();
productModel = "SC232";
beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
#region 参数定义
/// <summary>
/// 工位名称
/// </summary>
private string stationName = string.Empty;
public string StationName
{
get { return stationName; }
set { stationName = value; RaisePropertyChanged(nameof(StationName)); }
}
/// <summary>
/// 订单编号
/// </summary>
private string orderCode = string.Empty;
public string OrderCode
{
get { return orderCode; }
set { orderCode = value; RaisePropertyChanged(nameof(OrderCode)); }
}
/// <summary>
/// 计划编号
/// </summary>
private string planCode = string.Empty;
public string PlanCode
{
get { return planCode; }
set { planCode = value; RaisePropertyChanged(nameof(PlanCode)); }
}
/// <summary>
/// 产品型号
/// </summary>
private string productModel = string.Empty;
public string ProductModel
{
get { return productModel; }
set { productModel = value; RaisePropertyChanged(nameof(ProductModel)); }
}
/// <summary>
/// 开始时间
/// </summary>
private string beginTime = string.Empty;
public string BeginTime
{
get { return beginTime; }
set { beginTime = value; RaisePropertyChanged(nameof(BeginTime)); }
}
#endregion
}
}

@ -14,7 +14,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.UI.viewModel
namespace Aucma.Scada.UI.viewModel.InStoreInfo
{
public class InStoreInfoViewModel:ViewModelBase
{

@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Scada.UI.viewModel
namespace Aucma.Scada.UI.viewModel.InventoryInfo
{
public class InventoryInfoViewModel:ViewModelBase
{

@ -7,7 +7,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace Aucma.Scada.UI.viewModel
namespace Aucma.Scada.UI.viewModel.InventoryInfo
{
public class LinerInventoryViewModel :ViewModelBase
{

@ -3,7 +3,7 @@ using GalaSoft.MvvmLight.Command;
using System.Collections.Generic;
using System.Windows;
namespace Aucma.Scada.UI.viewModel
namespace Aucma.Scada.UI.viewModel.InventoryInfo
{
public class ShellInventoryViewModel : ViewModelBase
{
Loading…
Cancel
Save