优化
This commit is contained in:
@@ -543,6 +543,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
_logger.LogInformation("拉取金蝶数据:SysnDataNew3->" + JsonConvert.SerializeObject(erp_data));
|
_logger.LogInformation("拉取金蝶数据:SysnDataNew3->" + JsonConvert.SerializeObject(erp_data));
|
||||||
//老物料,应收数量修改为0
|
//老物料,应收数量修改为0
|
||||||
det.AccruedQty = 0;
|
det.AccruedQty = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
//操作完后剔除
|
//操作完后剔除
|
||||||
erp_removeList.Add(erp_data);
|
erp_removeList.Add(erp_data);
|
||||||
@@ -557,22 +558,16 @@ namespace WMS.Web.Domain.Services
|
|||||||
{
|
{
|
||||||
// if (det.MaterialId != erp_data.MaterialId || (det.MaterialId == erp_data.MaterialId && det.StockCode != erp_data.StockCode))
|
// if (det.MaterialId != erp_data.MaterialId || (det.MaterialId == erp_data.MaterialId && det.StockCode != erp_data.StockCode))
|
||||||
var IsHaveNewMaterial = data_list.Where(x => x.SourceBillNo == erp_data.BillNo).SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId).Any();
|
var IsHaveNewMaterial = data_list.Where(x => x.SourceBillNo == erp_data.BillNo).SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId).Any();
|
||||||
var IsHaveNewErpDetId = data_list.Where(x => x.SourceBillNo == erp_data.BillNo).SelectMany(s => s.Details).Where(x => x.ErpDetailId != erp_data.ErpDetailId).Any();
|
|
||||||
if (!IsHaveNewMaterial)
|
if (!IsHaveNewMaterial)
|
||||||
{
|
{
|
||||||
//当物料相同,仓库不同或者物料不同,就新增一条明细
|
//当物料相同,仓库不同或者物料不同,就新增一条明细
|
||||||
erp_addDetailsList.Add(erp_data);
|
erp_addDetailsList.Add(erp_data);
|
||||||
}
|
}
|
||||||
if (IsHaveNewErpDetId)
|
|
||||||
{
|
|
||||||
//当物料相同,明细不同新增一条明细
|
|
||||||
erp_addDetailsList.Add(erp_data);
|
|
||||||
//操作完后剔除
|
|
||||||
erp_removeList.Add(erp_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//去重
|
//去重
|
||||||
var erp_addDetailsList_group = erp_addDetailsList.Distinct().ToList();
|
var erp_addDetailsList_group = erp_addDetailsList.Distinct().ToList();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user