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-11-13 14:43:33 +08:00
parent a28f6bf0bd 3e84e63167
commit c09785f7df
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -313,6 +313,8 @@ namespace WMS.Web.Domain.Services
foreach (var entity in entityList) foreach (var entity in entityList)
{ {
var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId); var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId);
var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, instockDetail.SubStockId);
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.InStock(inStock.BillNo); entity.InStock(inStock.BillNo);
@@ -328,7 +330,7 @@ namespace WMS.Web.Domain.Services
OperateUser = userName, OperateUser = userName,
Remark = "来源单号:" + inStock.Details.First().SourceBillNo Remark = "来源单号:" + inStock.Details.First().SourceBillNo
+ "\r\n" + "入库单号:" + inStock.BillNo + "\r\n" + "入库单号:" + inStock.BillNo
+ "\r\n" + "仓位号:" + "" + "\r\n" + "仓位号:" + subStock
}; };
sList.Add(op); sList.Add(op);
} }
@@ -359,7 +361,7 @@ namespace WMS.Web.Domain.Services
public async Task<Result> BackRecord(BackRecord backRecord, LoginInDto loginInfo, bool isTransaction = true) public async Task<Result> BackRecord(BackRecord backRecord, LoginInDto loginInfo, bool isTransaction = true)
{ {
//获取序列号信息 //获取序列号信息
var serialNumbers = new List<string>();// inStock.Details.SelectMany(s => s.SerialNumbers).ToList(); var serialNumbers = backRecord.Details.Select(s => s.SerialNumbers).ToList();
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers); var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
var boxIds = entityList.Select(s => s.BoxId).ToList(); var boxIds = entityList.Select(s => s.BoxId).ToList();
var boxList = await _boxRepositories.GetEntityList(boxIds); var boxList = await _boxRepositories.GetEntityList(boxIds);