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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-04 14:05:47 +08:00
parent da67a60791 201a01912e
commit 454419d4b0
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -341,7 +341,7 @@ namespace WMS.Web.Repositories
{
var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.StockCode = entity.StockCode;
r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode);
r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode+ entity.OrgCode);
}
//获取物料信息 显示物料三件套
foreach (var r in response.SelectMany(s => s.details))
@@ -373,7 +373,7 @@ namespace WMS.Web.Repositories
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
response.StockCode = entity.StockCode;
response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode);
response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
//获取物料信息 显示物料三件套
foreach (var r in response.details)
{

2
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -153,7 +153,7 @@ namespace WMS.Web.Repositories
.GroupJoin(_context.BoxInventory, serial => serial.BoxId, box => box.BoxId, (serial, box) => new { serial, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, box })
.FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
if (entity.serial == null) return null;
if (entity == null || entity.serial == null) return null;
response.BoxId = entity.serial.BoxId;
response.SubStockId = entity.box?.SubStockId ?? 0;
response.SerialNumber = entity.serial.SerialNumber;