修改了pda

This commit is contained in:
2025-05-20 14:39:33 +08:00
parent 36d34a9bbe
commit e6df47b79a
15 changed files with 160 additions and 18 deletions

View File

@@ -40,6 +40,12 @@ namespace WMS.Web.Domain.Entitys
/// 序列号集
/// </summary>
public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 序列号集
/// </summary>
[NotMapped]
public List<string> TwoSerialNumbers { get; set; } = new List<string>();
/// <summary>
/// 备注
/// </summary>

View File

@@ -66,13 +66,20 @@ namespace WMS.Web.Domain.Entitys
public List<BoxDetails> Details { get; set; } = new List<BoxDetails>();
//移出
public Result Out(List<(string MaterialNumber, decimal Qty, List<string> SerialNumbers)> list)
public Result Out(List<(string MaterialNumber, decimal Qty, List<string> SerialNumbers)> list,string isNotCount)
{
foreach (var l in list)
{
var d = this.Details.FirstOrDefault(f => f.MaterialNumber == l.MaterialNumber);
if (d == null) return Result.ReFailure(ResultCodes.BoxMateriaNoData);
d.Qty = d.Qty - l.Qty;
if(isNotCount == "1")
{
}
else
{
d.Qty = d.Qty - l.Qty;
}
if (d.Qty <= 0) this.Details.Remove(d);
//foreach (var s in l.SerialNumbers) d.SerialNumbers.Remove(s);
}
@@ -80,7 +87,7 @@ namespace WMS.Web.Domain.Entitys
}
//移入
public Result In(List<(string MaterialNumber, decimal Qty, List<string> SerialNumbers)> list)
public Result In(List<(string MaterialNumber, decimal Qty, List<string> SerialNumbers)> list,string isNotCount)
{
foreach (var l in list)
{
@@ -95,7 +102,13 @@ namespace WMS.Web.Domain.Entitys
});
continue;
}
d.Qty = d.Qty + l.Qty;
if (isNotCount == "1")
{
}
else
{
d.Qty = d.Qty + l.Qty;
}
//d.SerialNumbers.AddRange(l.SerialNumbers);
}
return Result.ReSuccess();

View File

@@ -34,6 +34,13 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
[Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>();
///// <summary>
///// 第二个序列号
///// </summary>
//[Column("TwoSerialNumbers")]
//public List<string> TwoSerialNumbers { get; set; } = new List<string>();
///// <summary>
///// 仓位
/////</summary>