调整出库反写
This commit is contained in:
@@ -862,6 +862,14 @@
|
|||||||
明细
|
明细
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="M:WMS.Web.Domain.Entitys.OutStockTask.GenerateNo">
|
||||||
<summary>
|
<summary>
|
||||||
生成单据号
|
生成单据号
|
||||||
@@ -940,14 +948,6 @@
|
|||||||
出库结束时间
|
出库结束时间
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="T:WMS.Web.Domain.Entitys.TakeStock">
|
||||||
<summary>
|
<summary>
|
||||||
wms盘点单
|
wms盘点单
|
||||||
|
|||||||
@@ -80,6 +80,33 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
this.CreateTime = createTime;
|
this.CreateTime = createTime;
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
public void GenerateNo()
|
public void GenerateNo()
|
||||||
|
|||||||
@@ -72,25 +72,6 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
[Column("OutStockEndTime")]
|
[Column("OutStockEndTime")]
|
||||||
public DateTime? OutStockEndTime { get; set; }
|
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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
//任务单明细
|
//任务单明细
|
||||||
var tDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialId == d.MaterialId);
|
var tDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialId == d.MaterialId);
|
||||||
if (tDetail == null) continue;
|
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;
|
if (!res.IsSuccess) return res;
|
||||||
|
|
||||||
var outd = _mapper.Map<OutStockDetails>(tDetail);
|
var outd = _mapper.Map<OutStockDetails>(tDetail);
|
||||||
|
|||||||
Reference in New Issue
Block a user