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

6
FATrace.WPLApp/FATrace.WPLApp.csproj
View File

@@ -68,9 +68,9 @@
</ItemGroup>
<ItemGroup>
<None Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>

4
FATrace.WPLApp/Services/DataServices.cs
View File

@@ -593,7 +593,7 @@ namespace FATrace.WPLApp.Services
}
//内包扫码
OperateResultWeightScanCode = KeyencePlcMcNet!.ReadString("D1050", 20);
OperateResultWeightScanCode = KeyencePlcMcNet!.ReadString("D1050", 30);
if (OperateResultWeightScanCode.IsSuccess)
{
WeightScanCode = RevData(OperateResultWeightScanCode.Content).Replace("\r", "").Replace("\n", "").Trim();
@@ -612,7 +612,7 @@ namespace FATrace.WPLApp.Services
}
//外箱扫码
OperateResultBoxScanCode = KeyencePlcMcNet!.ReadString("D1250", 20);
OperateResultBoxScanCode = KeyencePlcMcNet!.ReadString("D1250", 30);
if (OperateResultBoxScanCode.IsSuccess)
{
BoxScanCode = RevData(OperateResultBoxScanCode.Content).Replace("\r", "").Replace("\n", "").Trim();

20
FATrace.WPLApp/Services/ReadFileServices.cs
View File

@@ -473,13 +473,13 @@ namespace FATrace.WPLApp.Services
Weight = GetCellString(row, 1, formatter),
ShelfLife = GetCellString(row, 2, formatter),
Origin = GetCellString(row, 3, formatter),
RawCode = GetCellString(row, 4, formatter),
SolidBeveBatch = GetCellString(row, 4, formatter),
RawName = GetCellString(row, 5, formatter),
SequenceNo = GetCellString(row, 6, formatter),
LoginDateTime = GetCellString(row, 7, formatter)
};
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.RawCode, entity.RawName, entity.SequenceNo, entity.LoginDateTime))
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.SolidBeveBatch, entity.RawName, entity.SequenceNo, entity.LoginDateTime))
continue;
list.Add(entity);
@@ -509,13 +509,13 @@ namespace FATrace.WPLApp.Services
Weight = GetCellString(row, 1, formatter),
ShelfLife = GetCellString(row, 2, formatter),
Origin = GetCellString(row, 3, formatter),
RawCode = GetCellString(row, 4, formatter),
SolidBeveBatch = GetCellString(row, 4, formatter),
RawName = GetCellString(row, 5, formatter),
SequenceNo = GetCellString(row, 6, formatter),
LoginDateTime = GetCellString(row, 7, formatter)
};
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.RawCode, entity.RawName,
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.SolidBeveBatch, entity.RawName,
entity.SequenceNo, entity.LoginDateTime))
continue;
@@ -583,13 +583,13 @@ namespace FATrace.WPLApp.Services
Weight = GetCellString(row, 1, formatter),
ShelfLife = GetCellString(row, 2, formatter),
Origin = GetCellString(row, 3, formatter),
RawCode = GetCellString(row, 4, formatter),
SolidBeveBatch = GetCellString(row, 4, formatter),
RawName = GetCellString(row, 5, formatter),
SequenceNo = GetCellString(row, 6, formatter),
LoginDateTime = GetCellString(row, 7, formatter)
};
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.RawCode, entity.RawName,
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.SolidBeveBatch, entity.RawName,
entity.SequenceNo, entity.LoginDateTime))
continue;
@@ -620,13 +620,13 @@ namespace FATrace.WPLApp.Services
Weight = GetCellString(row, 1, formatter),
ShelfLife = GetCellString(row, 2, formatter),
Origin = GetCellString(row, 3, formatter),
RawCode = GetCellString(row, 4, formatter),
SolidBeveBatch = GetCellString(row, 4, formatter),
RawName = GetCellString(row, 5, formatter),
SequenceNo = GetCellString(row, 6, formatter),
LoginDateTime = GetCellString(row, 7, formatter)
};
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.RawCode, entity.RawName,
if (IsAllEmpty(entity.Batch, entity.Weight, entity.ShelfLife, entity.Origin, entity.SolidBeveBatch, entity.RawName,
entity.SequenceNo, entity.LoginDateTime))
continue;
@@ -695,10 +695,10 @@ namespace FATrace.WPLApp.Services
InBagCode = GetCellString(row, 1, formatter),
Origin = GetCellString(row, 2, formatter),
RawName = GetCellString(row, 3, formatter),
RawCode = GetCellString(row, 4, formatter)
SolidBeveBatch = GetCellString(row, 4, formatter)
};
if (IsAllEmpty(entity.RawUseTime, entity.InBagCode, entity.Origin, entity.RawName, entity.RawCode))
if (IsAllEmpty(entity.RawUseTime, entity.InBagCode, entity.Origin, entity.RawName, entity.SolidBeveBatch))
continue;
list.Add(entity);

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));

6
FATrace.WPLApp/Views/FactoryInboundView.xaml
View File

@@ -62,8 +62,8 @@
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock VerticalAlignment="Center" Text="固体饮料批次：" />
<TextBox Width="160" Text="{Binding SolidBeveBatch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="0"
@@ -151,7 +151,7 @@
<DataGridTextColumn Width="120" Binding="{Binding Weight}" Header="重量(G)" />
<DataGridTextColumn Width="120" Binding="{Binding ShelfLife}" Header="保质期" />
<DataGridTextColumn Width="120" Binding="{Binding Origin}" Header="产地" />
<DataGridTextColumn Width="160" Binding="{Binding RawCode}" Header="原料代码" />
<DataGridTextColumn Width="160" Binding="{Binding SolidBeveBatch}" Header="固体饮料批次" />
<DataGridTextColumn Width="200" Binding="{Binding RawName}" Header="原料名称" />
<DataGridTextColumn Width="120" Binding="{Binding SequenceNo}" Header="序号" />
<DataGridTextColumn Width="180" Binding="{Binding LoginDateTime}" Header="登录日期时间" />

8
FATrace.WPLApp/Views/FactoryOutboundView.xaml
View File

@@ -62,8 +62,8 @@
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock VerticalAlignment="Center" Text="固体饮料批次：" />
<TextBox Width="160" Text="{Binding SolidBeveBatch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="0"
@@ -173,8 +173,8 @@
Header="产地" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
Binding="{Binding SolidBeveBatch}"
Header="固体饮料批次" />
<DataGridTextColumn
Width="180"
Binding="{Binding RawName}"

8
FATrace.WPLApp/Views/OEMInboundView.xaml
View File

@@ -62,8 +62,8 @@
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock VerticalAlignment="Center" Text="固体饮料批次：" />
<TextBox Width="160" Text="{Binding SolidBeveBatch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="0"
@@ -173,8 +173,8 @@
Header="产地" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
Binding="{Binding SolidBeveBatch}"
Header="固体饮料批次" />
<DataGridTextColumn
Width="180"
Binding="{Binding RawName}"

8
FATrace.WPLApp/Views/OEMOutboundView.xaml
View File

@@ -62,8 +62,8 @@
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock VerticalAlignment="Center" Text="固体饮料批次：" />
<TextBox Width="160" Text="{Binding SolidBeveBatch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="0"
@@ -173,8 +173,8 @@
Header="产地" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
Binding="{Binding SolidBeveBatch}"
Header="固体饮料批次" />
<DataGridTextColumn
Width="180"
Binding="{Binding RawName}"

8
FATrace.WPLApp/Views/OEMRawUsageInfoView.xaml
View File

@@ -62,8 +62,8 @@
Grid.Column="1"
Margin="0,0,10,8"
Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="原料代码：" />
<TextBox Width="160" Text="{Binding RawCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock VerticalAlignment="Center" Text="固体饮料批次：" />
<TextBox Width="160" Text="{Binding SolidBeveBatch, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
<StackPanel
Grid.Row="0"
@@ -173,8 +173,8 @@
Header="原料名称" />
<DataGridTextColumn
Width="140"
Binding="{Binding RawCode}"
Header="原料代码" />
Binding="{Binding SolidBeveBatch}"
Header="固体饮料批次" />
<!--<DataGridTextColumn Header="视频链接" Binding="{Binding VideoUrl}" Width="200" />-->
</DataGrid.Columns>
</DataGrid>