diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 16b1953b..3141e519 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.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 3c0a234d..5007bfda 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -209,7 +209,7 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.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(); 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(); slist.ForEach(f => rList.Add(new GetOutStockTaskByNoSubStockResponse(f))); 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(); @@ -274,7 +274,7 @@ namespace WMS.Web.Api.Controllers //先刷新选中的数据 await _outStockTaskService.Sync(res.Select(s => s.BillNo).ToList()); //再刷新3天内所有的 - return await _outStockTaskService.Sync(null, begin); + return await _outStockTaskService.Sync(null, begin); } /// /// 出库任务单详情