1 year ago
parent a7b6d4cc2b
commit a57e16ccf0

Binary file not shown.

Binary file not shown.

@ -611,11 +611,6 @@
主键
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.SmTaskExecution.PlanCode">
<summary>
计划编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.SmTaskExecution.OrderCode">
<summary>
工单编号

@ -0,0 +1,25 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.PrintTo")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.PrintTo")]
[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.PrintTo")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
// 由 MSBuild WriteCodeFragment 类生成。

@ -0,0 +1,17 @@
is_global = true
build_property.ApplicationManifest =
build_property.StartupObject =
build_property.ApplicationDefaultFont =
build_property.ApplicationHighDpiMode =
build_property.ApplicationUseCompatibleTextRendering =
build_property.ApplicationVisualStyles =
build_property.TargetFramework = net6.0-windows
build_property.TargetPlatformMinVersion = 7.0
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Aucma.Core.PrintTo_mok3q315_wpftmp
build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\

@ -39,7 +39,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
{
_taskExecutionServices = App.ServiceProvider.GetService<ISmTaskExecutionServices>();
StationName = "U壳/侧板半径生产";
StationName = "U壳/侧板钣金生产";
OrderCode = "8512365486";
PlanCode = "8659452123";
ProductModel = "SC-AUCMA-农夫山泉SC";

@ -7,6 +7,7 @@
xmlns:local="clr-namespace:Aucma.Core.SheetMetal.Views"
x:Class="Aucma.Core.SheetMetal.Views.SplitPlanView"
mc:Ignorable="d"
Background="White"
Title="计划维护" MinHeight="600" MinWidth="1000">
<Window.Resources>
@ -80,7 +81,7 @@
<Button Content="手动创建" Margin="5" Command="{Binding CreateTaskCommand}"/>
</WrapPanel>
</Grid>-->
<Grid Margin="0 30">
<Grid Margin="5 30">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
@ -113,8 +114,8 @@
</WrapPanel>
<WrapPanel Grid.Row="4" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="订单数量" FontSize="15" Foreground="Gray" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="PlanAmount" Text="{Binding SelectedItem.PlanAmount, ElementName=dgvMH}" Margin="15 0 0 0" materialDesign:HintAssist.Hint="打印数量" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="{Binding Path=ActualWidth, ElementName=PlanCode}"/>
<TextBlock Text="拆分数量" FontSize="15" Foreground="Gray" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="PlanAmount" Text="{Binding SelectedItem.PlanAmount, ElementName=dgvMH}" Margin="15 0 0 0" materialDesign:HintAssist.Hint="拆分数量" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="{Binding Path=ActualWidth, ElementName=PlanCode}"/>
</WrapPanel>
<WrapPanel Grid.Row="5" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<Button Content="手动创建" Margin="5" Command="{Binding CreateTaskCommand}" CommandParameter="{Binding Text, ElementName=PlanCode}"/>

@ -54,7 +54,7 @@ namespace Aucma.Core.SheetMetal {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;component/app.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;V1.0.0.0;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -0,0 +1,25 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Aucma.Core.SheetMetal")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("Aucma.Core.SheetMetal")]
[assembly: System.Reflection.AssemblyTitleAttribute("Aucma.Core.SheetMetal")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
// 由 MSBuild WriteCodeFragment 类生成。

@ -0,0 +1,17 @@
is_global = true
build_property.ApplicationManifest =
build_property.StartupObject =
build_property.ApplicationDefaultFont =
build_property.ApplicationHighDpiMode =
build_property.ApplicationUseCompatibleTextRendering =
build_property.ApplicationVisualStyles =
build_property.TargetFramework = net6.0-windows
build_property.TargetPlatformMinVersion = 7.0
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Aucma.Core.SheetMetal_ga211qda_wpftmp
build_property.ProjectDir = D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.SheetMetal\

@ -55,7 +55,7 @@ namespace Aucma.Core.SheetMetal.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;component/views/indexpage.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;V1.0.0.0;component/views/indexpage.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\IndexPage.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -62,7 +62,7 @@ namespace Aucma.Core.SheetMetal.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;component/views/logpageview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;V1.0.0.0;component/views/logpageview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\LogPageView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -168,7 +168,7 @@ namespace Aucma.Core.SheetMetal.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;component/views/mainwindow.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;V1.0.0.0;component/views/mainwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\MainWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -113,7 +113,7 @@ namespace Aucma.Core.SheetMetal.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;component/views/splitplanview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;V1.0.0.0;component/views/splitplanview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\SplitPlanView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -74,7 +74,7 @@ namespace Aucma.Core.SheetMetal.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;component/views/statisticspageview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.SheetMetal;V1.0.0.0;component/views/statisticspageview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\StatisticsPageView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

Loading…
Cancel
Save