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

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