18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整出库反写

Browse Source
This commit is contained in:
18942506660
2023-11-08 14:35:07 +08:00
parent 48eb94f14e
commit 6bbe7acacf
4 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -862,6 +862,14 @@
明细
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStockTask.OutStock(System.Int32,System.Decimal)">
<summary>
出库 反写 任务单
</summary>
<param name="materialId"></param>
<param name="qty"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStockTask.GenerateNo">
<summary>
生成单据号
@@ -940,14 +948,6 @@
出库结束时间
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStockTaskDetails.OutStock(System.Int32,System.Decimal)">
<summary>
出库 反写 任务单
</summary>
<param name="materialId"></param>
<param name="qty"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Entitys.TakeStock">
<summary>
wms盘点单

29
src/WMS.Web.Domain/Entitys/OutStockTask.cs
View File

@@ -80,6 +80,33 @@ namespace WMS.Web.Domain.Entitys
this.CreateTime = createTime;
}
/// <summary>
/// 出库 反写 任务单
/// </summary>
/// <param name="materialId"></param>
/// <param name="qty"></param>
/// <returns></returns>
public Result OutStock(int materialId, decimal qty)
{
var detail = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
if (detail == null) return Result.ReFailure(ResultCodes.OrderNoData);
if ((detail.AccruedQty - detail.RealityQty) < qty)
return Result.ReFailure(ResultCodes.OutStockQtyError);
if (detail.RealityQty <= 0)
detail.OutStockBeginTime = DateTime.Now;
detail.OutStockEndTime = DateTime.Now;
detail.RealityQty = detail.RealityQty + qty;
if (this.Details.Where(w => w.RealityQty >= w.AccruedQty).Count() == this.Details.Count())
this.Status = OutStockStatus.Already;
else
this.Status = OutStockStatus.Part;
return Result.ReSuccess();
}
/// <summary>
/// 生成单据号
/// </summary>
public void GenerateNo()
@@ -127,7 +154,7 @@ namespace WMS.Web.Domain.Entitys
if (list.GroupBy(g => g.ReceiptCustomerId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
var details = list.SelectMany(s => s.Details).ToList();
if (details.GroupBy(g => g.StockId).Count() > 1) return Result.ReFailure(ResultCodes.MergeStatusError);
//清空数据绑定

21
src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
View File

@@ -72,25 +72,6 @@ namespace WMS.Web.Domain.Entitys
[Column("OutStockEndTime")]
public DateTime? OutStockEndTime { get; set; }
/// <summary>
/// 出库 反写 任务单
/// </summary>
/// <param name="materialId"></param>
/// <param name="qty"></param>
/// <returns></returns>
public Result OutStock(int materialId,decimal qty)
{
if ((this.AccruedQty - this.RealityQty) < qty)
return Result.ReFailure(ResultCodes.OutStockQtyError);
if (this.RealityQty <= 0)
this.OutStockBeginTime = DateTime.Now;
this.OutStockEndTime = DateTime.Now;
this.RealityQty = this.RealityQty + qty;
return Result.ReSuccess();
}
}
}

2
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -56,7 +56,7 @@ namespace WMS.Web.Domain.Services
//任务单明细
var tDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialId == d.MaterialId);
if (tDetail == null) continue;
var res = tDetail.OutStock(d.MaterialId, d.Qty);
var res = outStockTask.OutStock(d.MaterialId, d.Qty);
if (!res.IsSuccess) return res;
var outd = _mapper.Map<OutStockDetails>(tDetail);