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
2024-01-03 14:25:18 +08:00
parent 8be6864b3c 1dc07a8ed9
commit e991071d67
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,7 @@ namespace WMS.Web.Domain.Services
//获取序列号信息 //获取序列号信息
var serialNumbers = inStock.Details.SelectMany(s => s.SerialNumbers).ToList(); var serialNumbers = inStock.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 = inStock.Details.Select(s => s.BoxId).ToList();
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);
@@ -319,19 +319,21 @@ 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 = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId);
var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId);
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.InStock(instockDetail.SourceBillNo, inStock.Type); entity.InStock(instockDetail.SourceBillNo, inStock.Type);
entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = entity.MaterialId, MaterialId = entity.MaterialId,
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 = InStockTypeConvert(inStock.Type), OperateType = InStockTypeConvert(inStock.Type),
OperateUser = userName, OperateUser = userName,
@@ -499,7 +501,7 @@ namespace WMS.Web.Domain.Services
if (isSuccess) if (isSuccess)
isSuccess = await _serialNumbersRepositories.AddRange(sList, false); isSuccess = await _serialNumbersRepositories.AddRange(sList, false);
if (isSuccess) if (isSuccess)
isSuccess = await _boxRepositories.EditEntityList(box_New_List,false); isSuccess = await _boxRepositories.EditEntityList(box_New_List, false);
//序列号操作记录 //序列号操作记录
var res = await this.SerialNumberOperate(soList, false); var res = await this.SerialNumberOperate(soList, false);