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-04-03 10:15:39 +08:00
parent 0c28dade59
commit f9ce3ebec9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services
}; };
if (moveBoxRecord.Type == MoveBoxType.Up) if (moveBoxRecord.Type == MoveBoxType.Up)
{ {
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode+ moveBoxRecord.StockCode+ moveBoxRecord.OrgCode); var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode + moveBoxRecord.StockCode + moveBoxRecord.OrgCode);
op.Remark += "\r\n" + "仓位:" + srcSubStock; op.Remark += "\r\n" + "仓位:" + srcSubStock;
} }
sList.Add(op); sList.Add(op);
@@ -180,6 +180,7 @@ namespace WMS.Web.Domain.Services
var serialNumbers = outStock.Details.SelectMany(s => s.SerialNumbers).ToList(); var serialNumbers = outStock.Details.SelectMany(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();
boxIds.AddRange(outStock.Details.SelectMany(s => s.BoxsDetails).Select(s => s.BoxId));
var boxList = await _boxRepositories.GetEntityList(boxIds); var boxList = await _boxRepositories.GetEntityList(boxIds);
var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId); var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
@@ -191,7 +192,8 @@ namespace WMS.Web.Domain.Services
List<SerialNumberOperate> sList = new List<SerialNumberOperate>(); List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
foreach (var entity in entityList) foreach (var entity in entityList)
{ {
var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId); var boxId = outStock.Details.SelectMany(s => s.BoxsDetails).FirstOrDefault(w => w.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId);
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
if (outstockDetail == null) continue; if (outstockDetail == null) continue;
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
@@ -202,8 +204,8 @@ namespace WMS.Web.Domain.Services
{ {
MaterialNumber = entity.MaterialNumber, MaterialNumber = entity.MaterialNumber,
SerialNumber = entity.SerialNumber, SerialNumber = entity.SerialNumber,
OrgId = box.OrgId, OrgId = box?.OrgId ?? 0,
SupplierId = box.SupplierId, SupplierId = box?.SupplierId ?? 0,
OperateTime = DateTime.Now, OperateTime = DateTime.Now,
OperateType = OutStockTypeConvert(outStock.Type), OperateType = OutStockTypeConvert(outStock.Type),
OperateUser = userName, OperateUser = userName,
@@ -322,7 +324,7 @@ namespace WMS.Web.Domain.Services
var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0; var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId); var box = boxList.FirstOrDefault(f => f.Id == boxId);
var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode+ inStock.StockCode+ inStock.OrgCode); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode);
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.InStock(instockDetail.SourceBillNo, inStock.Type); entity.InStock(instockDetail.SourceBillNo, inStock.Type);
entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now); entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
@@ -411,7 +413,7 @@ namespace WMS.Web.Domain.Services
if (backRecord.Type == BackRecordType.OutstockOn) if (backRecord.Type == BackRecordType.OutstockOn)
{ {
var subStockId = backRecord?.SubStockCode ?? ""; var subStockId = backRecord?.SubStockCode ?? "";
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, backRecord?.SubStockCode ?? ""+ backRecord?.StockCode ?? ""+ backRecord?.OrgCode ?? ""); var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, backRecord?.SubStockCode ?? "" + backRecord?.StockCode ?? "" + backRecord?.OrgCode ?? "");
op.Remark += "\r\n" + "仓位:" + srcSubStock; op.Remark += "\r\n" + "仓位:" + srcSubStock;
} }
sList.Add(op); sList.Add(op);
@@ -445,7 +447,7 @@ namespace WMS.Web.Domain.Services
{ {
var serialNumbers = takeStocks.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList(); var serialNumbers = takeStocks.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList();
var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers); var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
var boxIds = takeStocks.SelectMany(s=>s.Details).Select(s => s.BoxId).ToList(); var boxIds = takeStocks.SelectMany(s => s.Details).Select(s => s.BoxId).ToList();
var boxList = await _boxRepositories.GetEntityList(boxIds); var boxList = await _boxRepositories.GetEntityList(boxIds);
List<Box> box_New_List = new List<Box>(); List<Box> box_New_List = new List<Box>();