非采购上架-箱库存
This commit is contained in:
@@ -66,6 +66,10 @@ namespace WMS.Web.Domain.Services
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
|
||||
|
||||
var sour_update_entity = new BoxInventory();
|
||||
sour_update_entity.Id = sour.Id;
|
||||
sour_update_entity.BoxId = sour.BoxId;
|
||||
sour_update_entity.StockCode = sour.StockCode;
|
||||
sour_update_entity.SubStockId = sour.SubStockId;
|
||||
sour_update_entity.Details = new List<BoxInventoryDetails>();
|
||||
foreach (var dtoItem in dto.Details)
|
||||
{
|
||||
@@ -78,6 +82,9 @@ namespace WMS.Web.Domain.Services
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
|
||||
|
||||
var s_update_entity_det = new BoxInventoryDetails();
|
||||
s_update_entity_det.Id = sour_ChangeDetail.Id;
|
||||
s_update_entity_det.Fid = sour_ChangeDetail.Fid;
|
||||
s_update_entity_det.MaterialId = sour_ChangeDetail.MaterialId;
|
||||
s_update_entity_det.SerialNumbers = new List<string>();
|
||||
s_update_entity_det.Qty = sour_ChangeDetail.Qty - dtoItem.Qty;
|
||||
|
||||
@@ -105,6 +112,10 @@ namespace WMS.Web.Domain.Services
|
||||
else
|
||||
{
|
||||
var tag_update_entity = new BoxInventory();
|
||||
tag_update_entity.Id = tagBox.Id;
|
||||
tag_update_entity.BoxId = tagBox.BoxId;
|
||||
tag_update_entity.StockCode = tagBox.StockCode;
|
||||
tag_update_entity.SubStockId = tagBox.SubStockId;
|
||||
tag_update_entity.Details = new List<BoxInventoryDetails>();
|
||||
//2.2.1遍历改变的明细
|
||||
foreach (var item in dto.Details)
|
||||
@@ -113,7 +124,10 @@ namespace WMS.Web.Domain.Services
|
||||
var tagChangeDetail = tagBox.Details.Where(x => x.MaterialId == item.MaterialId).FirstOrDefault();
|
||||
if (tagChangeDetail != null)
|
||||
{
|
||||
var update_entity_det = new BoxInventoryDetails();
|
||||
var update_entity_det = new BoxInventoryDetails();
|
||||
update_entity_det.Id = tagChangeDetail.Id;
|
||||
update_entity_det.Fid = tagChangeDetail.Fid;
|
||||
update_entity_det.MaterialId = tagChangeDetail.MaterialId;
|
||||
update_entity_det.SerialNumbers = new List<string>();
|
||||
update_entity_det.Qty = tagChangeDetail.Qty + item.Qty;
|
||||
update_entity_det.SerialNumbers.AddRange(tagChangeDetail.SerialNumbers);
|
||||
@@ -285,6 +299,10 @@ namespace WMS.Web.Domain.Services
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
|
||||
//3.2创建更新对象
|
||||
var update_entity = new BoxInventory();
|
||||
update_entity.Id = boxInventory.Id;
|
||||
update_entity.BoxId = boxInventory.BoxId;
|
||||
update_entity.StockCode = boxInventory.StockCode;
|
||||
update_entity.SubStockId = boxInventory.SubStockId;
|
||||
update_entity.Details = new List<BoxInventoryDetails>();
|
||||
|
||||
//3.3遍历dto明细
|
||||
@@ -299,7 +317,9 @@ namespace WMS.Web.Domain.Services
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
|
||||
|
||||
var update_entity_det = new BoxInventoryDetails();
|
||||
update_entity_det.SerialNumbers = new List<string>();
|
||||
update_entity_det.Id = updateDetail.Id;
|
||||
update_entity_det.Fid = updateDetail.Fid;
|
||||
update_entity_det.MaterialId = updateDetail.MaterialId;
|
||||
update_entity_det.Qty = updateDetail.Qty - dtoItem.Qty;
|
||||
|
||||
//先把现有的序列号复制过来
|
||||
@@ -309,6 +329,146 @@ namespace WMS.Web.Domain.Services
|
||||
|
||||
update_entity.Details.Add(update_entity_det);
|
||||
}
|
||||
update_entitys.Add(update_entity);
|
||||
}
|
||||
}
|
||||
|
||||
var isSuccess = true;
|
||||
//4.数据库更新操作:更新和添加
|
||||
if (add_entitys.Count != 0)
|
||||
{
|
||||
isSuccess = await _boxInventoryRepositories.AddRange(add_entitys, isTransaction);
|
||||
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
|
||||
}
|
||||
if (update_entitys.Count != 0)
|
||||
{
|
||||
isSuccess = await _boxInventoryRepositories.UpdateRange(update_entitys, isTransaction);
|
||||
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
|
||||
}
|
||||
return Result.ReSuccess();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 采购上架-箱库存变更
|
||||
/// </summary>
|
||||
/// <param name="dtoDatas"></param>
|
||||
/// <param name="isTransaction"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<Result> GeneratePurchaseBox(List<BoxInventoryPurchaseGenerateDto> dtoDatas, bool isTransaction)
|
||||
{
|
||||
//1.判断来源数据是否存在
|
||||
if (dtoDatas != null || dtoDatas.Count == 0)
|
||||
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
|
||||
|
||||
var add_entitys = new List<BoxInventory>();
|
||||
|
||||
//1.1通过箱IDS获取箱库存-正常情况下“采购上架”,箱对应的库存是没有的,这里是为了下一步的判断,防止错误数据进入箱库存里面
|
||||
var boxIds = dtoDatas.SelectMany(x => x.BoxIds).ToList();
|
||||
var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
|
||||
|
||||
//2.遍历:dto
|
||||
foreach (var dto in dtoDatas)
|
||||
{
|
||||
//3.1上架的时候:箱一定是不存在于箱库存当中的,有则返回提示“已有箱库存,不需要再扫上架”
|
||||
var ishave = boxInventorys.Where(x =>dto.BoxIds.Contains(x.BoxId)).Any();
|
||||
if (ishave)
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
|
||||
|
||||
//3.2组装要新增的箱库存信息:箱和明细和序列号
|
||||
var addEntity = _mapper.Map<BoxInventory>(dto);
|
||||
addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
|
||||
add_entitys.Add(addEntity);
|
||||
}
|
||||
|
||||
var isSuccess = true;
|
||||
//4.数据库更新操作:更新和添加
|
||||
if (add_entitys.Count != 0)
|
||||
{
|
||||
isSuccess = await _boxInventoryRepositories.AddRange(add_entitys, isTransaction);
|
||||
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
|
||||
}
|
||||
return Result.ReSuccess();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 非采购上架-箱库存变更
|
||||
/// </summary>
|
||||
/// <param name="dtoDatas"></param>
|
||||
/// <param name="isTransaction"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<Result> GenerateNoPurchaseBox(List<BoxInventoryNoPurchaseGenerateDto> dtoDatas, bool isTransaction)
|
||||
{
|
||||
//1.判断来源数据是否存在
|
||||
if (dtoDatas != null || dtoDatas.Count == 0)
|
||||
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
|
||||
|
||||
var add_entitys = new List<BoxInventory>();
|
||||
var update_entitys = new List<BoxInventory>();
|
||||
|
||||
//1.1通过箱IDS获取箱库存-正常情况下“采购上架”,箱对应的库存是没有的,这里是为了下一步的判断,防止错误数据进入箱库存里面
|
||||
var boxIds = dtoDatas.SelectMany(x => x.BoxIds).ToList();
|
||||
var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
|
||||
|
||||
//2.遍历:dto
|
||||
foreach (var dto in dtoDatas)
|
||||
{
|
||||
//按箱上架
|
||||
if (dto.ShelfMethod == (int)ShelfMethod.Box)
|
||||
{
|
||||
//3.1上架的时候:箱一定是不存在于箱库存当中的,有则返回提示“已有箱库存,不需要再扫上架”
|
||||
var ishave = boxInventorys.Where(x => dto.BoxIds.Contains(x.BoxId)).Any();
|
||||
if (ishave)
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
|
||||
|
||||
//3.2组装要新增的箱库存信息:箱和明细和序列号
|
||||
var addEntity = _mapper.Map<BoxInventory>(dto);
|
||||
addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
|
||||
add_entitys.Add(addEntity);
|
||||
}
|
||||
//按产品上架:
|
||||
else
|
||||
{
|
||||
//按产品上架:箱只能是一个;箱可能存在库存(修改),也可能不存在库存(新增)
|
||||
var boxInventory = boxInventorys.Where(x => x.BoxId == dto.BoxIds.First()).FirstOrDefault();
|
||||
if (boxInventory == null)
|
||||
{
|
||||
//3.2组装要新增的箱库存信息:箱和明细和序列号
|
||||
var addEntity = _mapper.Map<BoxInventory>(dto);
|
||||
addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
|
||||
add_entitys.Add(addEntity);
|
||||
}
|
||||
else
|
||||
{
|
||||
//3.3创建更新对象
|
||||
var update_entity = new BoxInventory();
|
||||
update_entity.Id = boxInventory.Id;
|
||||
update_entity.BoxId = boxInventory.BoxId;
|
||||
update_entity.StockCode = boxInventory.StockCode;
|
||||
update_entity.SubStockId = boxInventory.SubStockId;
|
||||
update_entity.Details = new List<BoxInventoryDetails>();
|
||||
foreach (var dtoItem in dto.Details)
|
||||
{
|
||||
var update_entity_det = new BoxInventoryDetails();
|
||||
var updateDetail = boxInventory.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
|
||||
if (updateDetail == null)
|
||||
{
|
||||
|
||||
update_entity_det.MaterialId = dtoItem.MaterialId;
|
||||
update_entity_det.SerialNumbers = dtoItem.SerialNumbers;
|
||||
}
|
||||
else
|
||||
{
|
||||
update_entity_det.Id = updateDetail.Id;
|
||||
update_entity_det.Fid = updateDetail.Fid;
|
||||
update_entity_det.MaterialId = updateDetail.MaterialId;
|
||||
update_entity_det.SerialNumbers = updateDetail.SerialNumbers;
|
||||
update_entity_det.SerialNumbers.AddRange(dtoItem.SerialNumbers);
|
||||
}
|
||||
update_entity_det.Qty = updateDetail.Qty + dtoItem.Qty;
|
||||
update_entity.Details.Add(update_entity_det);
|
||||
}
|
||||
update_entitys.Add(update_entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user