diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index f34b5c4e..2042c63a 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs
index 47ce683f..a8af4f89 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs
@@ -92,25 +92,25 @@ namespace WMS.Web.Domain.Entitys
///
///
///
- public Result> OutStock(int materialId, decimal qty)
+ public Result> OutStock(int materialId, decimal qty)
{
if (this.Status == OutStockStatus.Already)
- return Result>.ReFailure(ResultCodes.OutStockTaskAlready);
+ return Result>.ReFailure(ResultCodes.OutStockTaskAlready);
if (this.Status == OutStockStatus.Repeal)
- return Result>.ReFailure(ResultCodes.OutStockTaskRepeal);
+ return Result>.ReFailure(ResultCodes.OutStockTaskRepeal);
var detail = this.Details.FirstOrDefault(f => f.MaterialId == materialId);
- if (detail == null) return Result>.ReFailure(ResultCodes.OrderNoData);
+ if (detail == null) return Result>.ReFailure(ResultCodes.OrderNoData);
if ((detail.AccruedQty - detail.RealityQty) < qty)
- return Result>.ReFailure(ResultCodes.OutStockQtyError);
- List<(string sourceBillNo, decimal qty)> resList = new List<(string sourceBillNo, decimal qty)>();
+ return Result>.ReFailure(ResultCodes.OutStockQtyError);
+ List<(int erpDetailId, decimal qty)> resList = new List<(int erpDetailId, decimal qty)>();
var mQty = qty;
foreach (var d in detail.ErpDetails)
{
if ((d.AccruedQty - d.RealityQty) >= mQty)
{
d.RealityQty += qty;
- resList.Add((d.SourceBillNo, mQty));
+ resList.Add((d.Erp_DetailId, mQty));
break;//本次出库数量已经分配完毕 调出循环
}
else
@@ -119,7 +119,7 @@ namespace WMS.Web.Domain.Entitys
var cQty = d.AccruedQty - d.RealityQty;//本次出货数量
mQty -= cQty;
d.RealityQty = d.AccruedQty;
- resList.Add((d.SourceBillNo, cQty));
+ resList.Add((d.Erp_DetailId, cQty));
}
}
@@ -136,7 +136,7 @@ namespace WMS.Web.Domain.Entitys
else
this.Status = OutStockStatus.Part;
- return Result>.ReSuccess(resList);
+ return Result>.ReSuccess(resList);
}
///
/// 生成单据号
diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index 88ec8a95..5ed40bdd 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -121,7 +121,7 @@ namespace WMS.Web.Domain.Services
//循环添加erp同步明细
foreach (var c in res.Data)
{
- var tErpDetail = tDetail.ErpDetails.FirstOrDefault(f => f.SourceBillNo.Equals(c.sourceBillNo));
+ var tErpDetail = tDetail.ErpDetails.FirstOrDefault(f => f.Erp_DetailId==c.erpDetailId);
var oErpDetail = _mapper.Map(tErpDetail);
oErpDetail.Qty = c.qty;
outd.ErpDetails.Add(oErpDetail);