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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-08-14 17:31:34 +08:00
parent bc27fb250e
commit 8eb3a784d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

6
src/WMS.Web.Api/Controllers/OutStockTaskController.cs
View File

@@ -209,7 +209,7 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null) if (loginInfo == null || loginInfo.UserInfo == null)
return ResultPagedList<string>.ReFailure(ResultCodes.Token_Invalid_Error); return ResultPagedList<string>.ReFailure(ResultCodes.Token_Invalid_Error);
var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo,dto.StockCode); var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo, dto.StockCode);
int total = res.Count(); int total = res.Count();
res = res.OrderByDescending(o => o).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList(); res = res.OrderByDescending(o => o).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList();
@@ -248,7 +248,7 @@ namespace WMS.Web.Api.Controllers
var slist = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList(); var slist = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList();
slist.ForEach(f => rList.Add(new GetOutStockTaskByNoSubStockResponse(f))); slist.ForEach(f => rList.Add(new GetOutStockTaskByNoSubStockResponse(f)));
x.MaterialSubStocks = rList.OrderBy(s => s.SubStock_Do).Select(s => s.SubStock).ToList(); x.MaterialSubStocks = rList.OrderBy(s => s.SubStock_Do).Select(s => s.SubStock).ToList();
x.FistSubStock = rList.OrderBy(s => s.SubStock_Do).First().SubStock_Do; x.FistSubStock = rList.OrderBy(s => s.SubStock_Do).First()?.SubStock_Do ?? "z";
}); });
res.details = res.details.OrderBy(s => s.FistSubStock).ToList(); res.details = res.details.OrderBy(s => s.FistSubStock).ToList();
@@ -274,7 +274,7 @@ namespace WMS.Web.Api.Controllers
//先刷新选中的数据 //先刷新选中的数据
await _outStockTaskService.Sync(res.Select(s => s.BillNo).ToList()); await _outStockTaskService.Sync(res.Select(s => s.BillNo).ToList());
//再刷新3天内所有的 //再刷新3天内所有的
return await _outStockTaskService.Sync(null, begin); return await _outStockTaskService.Sync(null, begin);
} }
/// <summary> /// <summary>
/// 出库任务单详情 /// 出库任务单详情