改了存装箱存码
This commit is contained in:
@@ -120,17 +120,32 @@ namespace BarCode.Web.Domain.Services
|
|||||||
if (!resCarton.IsSuccess) return resCarton;
|
if (!resCarton.IsSuccess) return resCarton;
|
||||||
|
|
||||||
var materialNumbers = dto.Details.GroupBy(g => g.MaterialNumber).Select(s => s.Key).ToList();
|
var materialNumbers = dto.Details.GroupBy(g => g.MaterialNumber).Select(s => s.Key).ToList();
|
||||||
|
|
||||||
foreach (var m in materialNumbers)
|
foreach (var m in materialNumbers)
|
||||||
{
|
{
|
||||||
|
List<string> s=[null];
|
||||||
|
s.Clear();
|
||||||
var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m));
|
var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m));
|
||||||
var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.SerialNumber).ToList();
|
var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.SerialNumber).ToList();
|
||||||
|
for(int i=0;i<serialNumbers.Count;i++)
|
||||||
|
{
|
||||||
|
//跟据serialNumbers 取得对应的serialNumber
|
||||||
|
var serialList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(serialNumbers[i]);
|
||||||
|
for (int j = 0; j < serialList2.Count; j++)
|
||||||
|
{
|
||||||
|
s.Add( serialList2[j].SerialNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if (detail == null)
|
if (detail == null)
|
||||||
{
|
{
|
||||||
detail = new BoxDetails()
|
detail = new BoxDetails()
|
||||||
{
|
{
|
||||||
MaterialNumber = m,
|
MaterialNumber = m,
|
||||||
Qty = serialNumbers.Count(),
|
Qty = serialNumbers.Count(),
|
||||||
SerialNumbers = serialNumbers
|
//SerialNumbers = serialNumbers
|
||||||
|
SerialNumbers = s
|
||||||
};
|
};
|
||||||
box.Details.Add(detail);
|
box.Details.Add(detail);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -321,8 +321,10 @@ namespace BarCode.Web.Repositories
|
|||||||
{
|
{
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
str += $"SerialNumbers like '%\"{serialNumbers[i]}\"%'";
|
str += $"SerialNumbers like '%\"{serialNumbers[i]}\"%'";
|
||||||
|
//str += $"twoSerialNumber like '%\"{serialNumbers[i]}\"%'";
|
||||||
else
|
else
|
||||||
str += $" or SerialNumbers like '%\"{serialNumbers[i]}\"%'";
|
str += $" or SerialNumbers like '%\"{serialNumbers[i]}\"%'";
|
||||||
|
//str += $" or twoSerialNumber like '%\"{serialNumbers[i]}\"%'";
|
||||||
}
|
}
|
||||||
var fs = FormattableStringFactory.Create(str);
|
var fs = FormattableStringFactory.Create(str);
|
||||||
var list = _context.Set<BoxDetails>().FromSqlInterpolated(fs).ToList();
|
var list = _context.Set<BoxDetails>().FromSqlInterpolated(fs).ToList();
|
||||||
|
|||||||
Reference in New Issue
Block a user