Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP
This commit is contained in:
commit
d438764c43
5 files changed
+14
-4
No files matched your search
@@ -0,0 +1,4 @@
|
|||||||
|
[*.cs]
|
||||||
|
|
||||||
|
# CS1591: 缺少对公共可见类型或成员的 XML 注释
|
||||||
|
dotnet_diagnostic.CS1591.severity = silent
|
||||||
@@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Audit", "Audit.csproj", "{4
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csproj", "{2B23C1BD-0231-4F0C-A142-A220C75FFE5B}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41EA4192-84E5-4AAB-A2CA-7DF5D6B0F5DA}"
|
||||||
|
ProjectSection(SolutionItems) = preProject
|
||||||
|
.editorconfig = .editorconfig
|
||||||
|
EndProjectSection
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
|||||||
@@ -317,6 +317,9 @@
|
|||||||
<Compile Include="UserAccountProvide.cs" />
|
<Compile Include="UserAccountProvide.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="..\.editorconfig">
|
||||||
|
<Link>.editorconfig</Link>
|
||||||
|
</None>
|
||||||
<None Include="App.Config" />
|
<None Include="App.Config" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
<EntityDeploy Include="SQL_Ti.edmx">
|
<EntityDeploy Include="SQL_Ti.edmx">
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ namespace Audit.View
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
|
private void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(this.stuff_ProductCode.Text)) System.Windows.MessageBox.Show("ERR.C0101:无效的原料信息");//检查原料代码
|
if (string.IsNullOrEmpty(this.stuff_ProductCode.Text)) System.Windows.MessageBox.Show("ERR.C0101:无效的原料信息");//检查原料代码
|
||||||
|
|||||||
@@ -19,10 +19,6 @@ namespace Audit.ViewModel
|
|||||||
{
|
{
|
||||||
private List<Product> products = new List<Product>();
|
private List<Product> products = new List<Product>();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 加入AuditData为属性成员
|
|
||||||
/// </summary>
|
|
||||||
public AuditData AuditData { get; set; } = AuditData.Instance;
|
|
||||||
/// <summary>
|
|
||||||
/// 所有原料
|
/// 所有原料
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<Product> Product
|
public List<Product> Product
|
||||||
|
|||||||
Reference in new issue
Block a user