TyroneGit/FATrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客户要求的更改

Browse Source
This commit is contained in:
Tyrone CT
2026-05-15 17:17:08 +08:00
parent add4308b91
commit 7dabeddde4
23 changed files with 248 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FATrace.WPLApp/ViewModels/FactoryInboundViewModel.cs
View File

@@ -54,11 +54,11 @@ namespace FATrace.WPLApp.ViewModels
/// </summary>
public string? Origin { get => _origin; set { _origin = value; RaisePropertyChanged(); } }
private string? _rawCode;
private string? _solidBeveBatch;
/// <summary>
/// 原料代码模糊匹配
/// 固体饮料批次 模糊匹配
/// </summary>
public string? RawCode { get => _rawCode; set { _rawCode = value; RaisePropertyChanged(); } }
public string? SolidBeveBatch { get => _solidBeveBatch; set { _solidBeveBatch = value; RaisePropertyChanged(); } }
private string? _rawName;
/// <summary>
@@ -135,7 +135,7 @@ namespace FATrace.WPLApp.ViewModels
private void ClearFilters()
{
Origin = RawCode = RawName = string.Empty;
Origin = SolidBeveBatch = RawName = string.Empty;
StartDate = null;
EndDate = null;
}
@@ -154,8 +154,8 @@ namespace FATrace.WPLApp.ViewModels
if (!string.IsNullOrWhiteSpace(Origin))
q = q.Where(a => a.Origin != null && a.Origin.Contains(Origin));
if (!string.IsNullOrWhiteSpace(RawCode))
q = q.Where(a => a.RawCode != null && a.RawCode.Contains(RawCode));
if (!string.IsNullOrWhiteSpace(SolidBeveBatch))
q = q.Where(a => a.SolidBeveBatch != null && a.SolidBeveBatch.Contains(SolidBeveBatch));
if (!string.IsNullOrWhiteSpace(RawName))
q = q.Where(a => a.RawName != null && a.RawName.Contains(RawName));

10
FATrace.WPLApp/ViewModels/FactoryOutboundViewModel.cs
View File

@@ -50,8 +50,8 @@ namespace FATrace.WPLApp.ViewModels
private string? _origin;
public string? Origin { get => _origin; set { _origin = value; RaisePropertyChanged(); } }
private string? _rawCode;
public string? RawCode { get => _rawCode; set { _rawCode = value; RaisePropertyChanged(); } }
private string? _solidBeveBatch;
public string? SolidBeveBatch { get => _solidBeveBatch; set { _solidBeveBatch = value; RaisePropertyChanged(); } }
private string? _rawName;
public string? RawName { get => _rawName; set { _rawName = value; RaisePropertyChanged(); } }
@@ -110,7 +110,7 @@ namespace FATrace.WPLApp.ViewModels
private void ClearFilters()
{
Origin = RawCode = RawName = Batch = string.Empty;
Origin = SolidBeveBatch = RawName = Batch = string.Empty;
StartDate = null;
EndDate = null;
}
@@ -129,8 +129,8 @@ namespace FATrace.WPLApp.ViewModels
if (!string.IsNullOrWhiteSpace(Origin))
q = q.Where(a => a.Origin != null && a.Origin.Contains(Origin));
if (!string.IsNullOrWhiteSpace(RawCode))
q = q.Where(a => a.RawCode != null && a.RawCode.Contains(RawCode));
if (!string.IsNullOrWhiteSpace(SolidBeveBatch))
q = q.Where(a => a.SolidBeveBatch != null && a.SolidBeveBatch.Contains(SolidBeveBatch));
if (!string.IsNullOrWhiteSpace(RawName))
q = q.Where(a => a.RawName != null && a.RawName.Contains(RawName));
if (!string.IsNullOrWhiteSpace(Batch))

10
FATrace.WPLApp/ViewModels/OEMInboundViewModel.cs
View File

@@ -50,8 +50,8 @@ namespace FATrace.WPLApp.ViewModels
private string? _origin;
public string? Origin { get => _origin; set { _origin = value; RaisePropertyChanged(); } }
private string? _rawCode;
public string? RawCode { get => _rawCode; set { _rawCode = value; RaisePropertyChanged(); } }
private string? _solidBeveBatch;
public string? SolidBeveBatch { get => _solidBeveBatch; set { _solidBeveBatch = value; RaisePropertyChanged(); } }
private string? _rawName;
public string? RawName { get => _rawName; set { _rawName = value; RaisePropertyChanged(); } }
@@ -110,7 +110,7 @@ namespace FATrace.WPLApp.ViewModels
private void ClearFilters()
{
Origin = RawCode = RawName = Batch = string.Empty;
Origin = SolidBeveBatch = RawName = Batch = string.Empty;
StartDate = null;
EndDate = null;
}
@@ -129,8 +129,8 @@ namespace FATrace.WPLApp.ViewModels
if (!string.IsNullOrWhiteSpace(Origin))
q = q.Where(a => a.Origin != null && a.Origin.Contains(Origin));
if (!string.IsNullOrWhiteSpace(RawCode))
q = q.Where(a => a.RawCode != null && a.RawCode.Contains(RawCode));
if (!string.IsNullOrWhiteSpace(SolidBeveBatch))
q = q.Where(a => a.SolidBeveBatch != null && a.SolidBeveBatch.Contains(SolidBeveBatch));
if (!string.IsNullOrWhiteSpace(RawName))
q = q.Where(a => a.RawName != null && a.RawName.Contains(RawName));
if (!string.IsNullOrWhiteSpace(Batch))

10
FATrace.WPLApp/ViewModels/OEMOutboundViewModel.cs
View File

@@ -50,8 +50,8 @@ namespace FATrace.WPLApp.ViewModels
private string? _origin;
public string? Origin { get => _origin; set { _origin = value; RaisePropertyChanged(); } }
private string? _rawCode;
public string? RawCode { get => _rawCode; set { _rawCode = value; RaisePropertyChanged(); } }
private string? _solidBeveBatch;
public string? SolidBeveBatch { get => _solidBeveBatch; set { _solidBeveBatch = value; RaisePropertyChanged(); } }
private string? _rawName;
public string? RawName { get => _rawName; set { _rawName = value; RaisePropertyChanged(); } }
@@ -110,7 +110,7 @@ namespace FATrace.WPLApp.ViewModels
private void ClearFilters()
{
Origin = RawCode = RawName = Batch = string.Empty;
Origin = SolidBeveBatch = RawName = Batch = string.Empty;
StartDate = null;
EndDate = null;
}
@@ -129,8 +129,8 @@ namespace FATrace.WPLApp.ViewModels
if (!string.IsNullOrWhiteSpace(Origin))
q = q.Where(a => a.Origin != null && a.Origin.Contains(Origin));
if (!string.IsNullOrWhiteSpace(RawCode))
q = q.Where(a => a.RawCode != null && a.RawCode.Contains(RawCode));
if (!string.IsNullOrWhiteSpace(SolidBeveBatch))
q = q.Where(a => a.SolidBeveBatch != null && a.SolidBeveBatch.Contains(SolidBeveBatch));
if (!string.IsNullOrWhiteSpace(RawName))
q = q.Where(a => a.RawName != null && a.RawName.Contains(RawName));
if (!string.IsNullOrWhiteSpace(Batch))

10
FATrace.WPLApp/ViewModels/OEMRawUsageInfoViewModel.cs
View File

@@ -53,8 +53,8 @@ namespace FATrace.WPLApp.ViewModels
private string? _origin;
public string? Origin { get => _origin; set { _origin = value; RaisePropertyChanged(); } }
private string? _rawCode;
public string? RawCode { get => _rawCode; set { _rawCode = value; RaisePropertyChanged(); } }
private string? _solidBeveBatch;
public string? SolidBeveBatch { get => _solidBeveBatch; set { _solidBeveBatch = value; RaisePropertyChanged(); } }
private string? _rawName;
public string? RawName { get => _rawName; set { _rawName = value; RaisePropertyChanged(); } }
@@ -110,7 +110,7 @@ namespace FATrace.WPLApp.ViewModels
private void ClearFilters()
{
InBagCode = Origin = RawCode = RawName = string.Empty;
InBagCode = Origin = SolidBeveBatch = RawName = string.Empty;
StartDate = null;
EndDate = null;
}
@@ -131,8 +131,8 @@ namespace FATrace.WPLApp.ViewModels
q = q.Where(a => a.InBagCode != null && a.InBagCode.Contains(InBagCode));
if (!string.IsNullOrWhiteSpace(Origin))
q = q.Where(a => a.Origin != null && a.Origin.Contains(Origin));
if (!string.IsNullOrWhiteSpace(RawCode))
q = q.Where(a => a.RawCode != null && a.RawCode.Contains(RawCode));
if (!string.IsNullOrWhiteSpace(SolidBeveBatch))
q = q.Where(a => a.SolidBeveBatch != null && a.SolidBeveBatch.Contains(SolidBeveBatch));
if (!string.IsNullOrWhiteSpace(RawName))
q = q.Where(a => a.RawName != null && a.RawName.Contains(RawName));