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-14 11:44:33 +08:00
parent c97cb61def
commit e4c79c0801
1 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,14 +485,11 @@ namespace WMS.Web.Domain.Services
//2.遍历已有的任务单 //2.遍历已有的任务单
if (data_list.Count != 0) if (data_list.Count != 0)
{ {
//2.1遍历任务单明细：改变已有的值和要添加的明细
data_list.SelectMany(s => s.Details).ToList().ForEach(det =>
{
//2.1去当前erp的明细
var erp_data = erp_list.Where(x => x.ErpDetailId == det.ErpDetailId).FirstOrDefault();
if (erp_data != null)
{
foreach (var erp_data in erp_list)
{
data_list.SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId).ToList().ForEach(det =>
{
//2.1.2物料相同的，就改变数值 //2.1.2物料相同的，就改变数值
if (det.MaterialId == erp_data.MaterialId) if (det.MaterialId == erp_data.MaterialId)
{ {
@@ -510,10 +507,38 @@ namespace WMS.Web.Domain.Services
} }
//操作完后剔除 //操作完后剔除
erp_removeList.Add(erp_data); erp_removeList.Add(erp_data);
} });
}
////2.1遍历任务单明细：改变已有的值和要添加的明细
//data_list.SelectMany(s => s.Details).ToList().ForEach(det =>
//{
// //2.1去当前erp的明细
// var erp_data = erp_list.Where(x => x.ErpDetailId == det.ErpDetailId).FirstOrDefault();
// if (erp_data != null)
// {
// //2.1.2物料相同的，就改变数值
// if (det.MaterialId == erp_data.MaterialId)
// {
// //物料相同的，就改变数值
// det.Remark = erp_data.Remark;
// det.AccruedQty = erp_data.Qty;
// det.FactoryPrice = erp_data.FactoryPrice;
// det.DeliveredQty = erp_data.DeliveredQty;
// }
// else
// {
// //老物料，应收数量修改为0
// det.AccruedQty = 0;
// }
// //操作完后剔除
// erp_removeList.Add(erp_data);
// }
}); //});
//2.1.1当物料相同，仓库不同或者物料不同，就新增一条明细 //2.1.1当物料相同，仓库不同或者物料不同，就新增一条明细
foreach (var erp_data in erp_list) foreach (var erp_data in erp_list)
@@ -574,7 +599,7 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(ResultCodes.DateWriteError); return Result.ReFailure(ResultCodes.DateWriteError);
//2.4剔除:已修改的单据 //2.4剔除:已修改的单据
foreach (var item in erp_removeList) foreach (var item in erp_removeList.Distinct().ToList())
erp_list.Remove(item); erp_list.Remove(item);
//3.wms任务单的来源单据编号不存在于erp中，那么就新增 //3.wms任务单的来源单据编号不存在于erp中，那么就新增