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

优化

Browse Source
This commit is contained in:
tongfei
2024-03-12 15:11:48 +08:00
parent ca9d71f421
commit ca82a36a95
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -492,28 +492,37 @@ namespace WMS.Web.Domain.Services
var erp_data = erp_list.Where(x => x.ErpDetailId == det.ErpDetailId).FirstOrDefault(); var erp_data = erp_list.Where(x => x.ErpDetailId == det.ErpDetailId).FirstOrDefault();
if (erp_data != null) if (erp_data != null)
{ {
//2.1.1当物料相同，仓库不同或者物料不同，就新增一条明细
//2.1.2物料相同的，就改变数值 //2.1.2物料相同的，就改变数值
if (det.MaterialId != erp_data.MaterialId || (det.MaterialId == erp_data.MaterialId && det.StockCode != erp_data.StockCode)) if (det.MaterialId == erp_data.MaterialId)
{
//老物料，应收数量修改为0
det.AccruedQty = 0;
//当物料相同，仓库不同或者物料不同，就新增一条明细
erp_addDetailsList.Add(erp_data);
}
else if (det.MaterialId == erp_data.MaterialId)
{ {
//物料相同的，就改变数值 //物料相同的，就改变数值
det.Remark = erp_data.Remark; det.Remark = erp_data.Remark;
det.AccruedQty = erp_data.Qty; det.AccruedQty = erp_data.Qty;
det.FactoryPrice = erp_data.FactoryPrice; det.FactoryPrice = erp_data.FactoryPrice;
det.DeliveredQty = erp_data.DeliveredQty; det.DeliveredQty = erp_data.DeliveredQty;
}
else
{
//老物料，应收数量修改为0
det.AccruedQty = 0;
} }
//操作完后剔除 //操作完后剔除
erp_removeList.Add(erp_data); erp_removeList.Add(erp_data);
} }
}); });
//2.1.1当物料相同，仓库不同或者物料不同，就新增一条明细
foreach (var erp_data in erp_list)
{
// if (det.MaterialId != erp_data.MaterialId || (det.MaterialId == erp_data.MaterialId && det.StockCode != erp_data.StockCode))
var IsHaveNewMaterial = data_list.SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId==x.MaterialId).Any();
if(!IsHaveNewMaterial)
//当物料相同，仓库不同或者物料不同，就新增一条明细
erp_addDetailsList.Add(erp_data);
}
//2.2遍历任务单：添加新的明细 //2.2遍历任务单：添加新的明细
data_list.ForEach(order => data_list.ForEach(order =>
{ {