box-inventory-优化
This commit is contained in:
@@ -327,224 +327,6 @@ namespace WMS.Web.Domain.Services
|
||||
return Result.ReSuccess();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 采购上架-箱库存变更--这个有点问题--请使用HandlBoxInventory
|
||||
/// </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 = dto.BoxIds.All(x => boxInventorys.Any(t => t.BoxId == x));////代码意义:当前dto中的BoxIds是否全部等于箱库存中的boxId;dto中有一个boxID不等于箱库存中的,就失败
|
||||
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>
|
||||
/// 非采购上架-箱库存变更--这个有点问题--请使用HandlBoxInventory
|
||||
/// </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.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
|
||||
{
|
||||
//3.1上架的时候:箱一定是不存在于箱库存当中的,有则返回提示“已有箱库存,不需要再扫上架”
|
||||
var isAllTrueHave = dto.BoxIds.All(x => boxInventorys.Any(t => t.BoxId == x));//代码意义:当前dto中的BoxIds是否全部等于箱库存中的boxId;dto中有一个boxID不等于箱库存中的,就失败
|
||||
if (isAllTrueHave)
|
||||
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 = boxInventory;
|
||||
update_entity.Details = boxInventory.Details;
|
||||
foreach (var dtoItem in dto.Details)
|
||||
{
|
||||
//明细对应的物料:存在就修改,不存在即新增
|
||||
var update_entity_det = new BoxInventoryDetails();
|
||||
var updateDetail = update_entity.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
|
||||
if (updateDetail == null)
|
||||
{
|
||||
update_entity_det.Qty = dtoItem.Qty;
|
||||
update_entity_det.MaterialId = dtoItem.MaterialId;
|
||||
update_entity_det.SerialNumbers = dtoItem.SerialNumbers;
|
||||
update_entity.Details.Add(update_entity_det);
|
||||
}
|
||||
else
|
||||
{
|
||||
updateDetail.Qty = updateDetail.Qty + dtoItem.Qty;
|
||||
updateDetail.SerialNumbers.AddRange(dtoItem.SerialNumbers);
|
||||
}
|
||||
}
|
||||
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>
|
||||
/// 出库下架-箱库存变更--这个有点问题--请使用HandlBoxInventory
|
||||
/// </summary>
|
||||
/// <param name="dtoDatas"></param>
|
||||
/// <param name="isTransaction"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<Result> GenerateOutStockBox(List<BoxInventoryOutStockGenerateDto> dtoDatas, bool isTransaction)
|
||||
{
|
||||
//1.判断来源数据是否存在
|
||||
if (dtoDatas != null || dtoDatas.Count == 0)
|
||||
return Result.ReFailure(ResultCodes.InventoryNoSourceError);
|
||||
|
||||
var delete_entitys_ids = new List<int>();
|
||||
var update_entitys = new List<BoxInventory>();
|
||||
|
||||
//1.1通过箱IDS获取箱库存
|
||||
var boxIds = dtoDatas.Select(x => x.BoxId).ToList();
|
||||
var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
|
||||
|
||||
//2.遍历:dto
|
||||
foreach (var dto in dtoDatas)
|
||||
{
|
||||
//3.1出库的时候:箱一定是存在于箱库存当中的,没有则返回提示“箱库存数据不存在,请稍候再试!”
|
||||
// 获取箱库存
|
||||
var boxInventory = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
|
||||
if (boxInventory==null)
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
|
||||
|
||||
//按箱:出库
|
||||
if (dto.InventoryInOutMethod == (int)InventoryInOutMethod.Box)
|
||||
{
|
||||
//直接添加要删除的箱
|
||||
delete_entitys_ids.Add(boxInventory.Id);
|
||||
}
|
||||
//按产品:出库
|
||||
else
|
||||
{
|
||||
//3.3创建更新对象
|
||||
var update_entity = boxInventory;
|
||||
update_entity.Details = boxInventory.Details;
|
||||
|
||||
//3.2.遍历:dto明细
|
||||
foreach (var dtoItem in dto.Details)
|
||||
{
|
||||
//3.3.找到当前明细物料:没有则返回失败;提示:“该箱物料库存不存在”
|
||||
var update_entityDetail = update_entity.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
|
||||
if (update_entityDetail == null)
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryMaterialNoDataError);
|
||||
//3.4判断库存数量是否不足
|
||||
if (update_entityDetail.Qty < dtoItem.Qty)
|
||||
return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
|
||||
|
||||
//3.5物料库存数量变更:减库存
|
||||
update_entityDetail.Qty = update_entityDetail.Qty - dtoItem.Qty;
|
||||
//3.6移除要出库的序列号
|
||||
update_entityDetail.SerialNumbers.RemoveAll(x => dtoItem.SerialNumbers.Contains(x));
|
||||
|
||||
}
|
||||
//4.1判断要修改的箱库存对象:是否所有的物料库存的数量都为0,“是”则删除该箱库存,"否"则修改;
|
||||
var isAllNoInventory = update_entity.Details.All(x => x.Qty == 0);
|
||||
if (isAllNoInventory)
|
||||
delete_entitys_ids.Add(update_entity.Id);
|
||||
else
|
||||
//4.2添加要更新的箱库存实体
|
||||
update_entitys.Add(update_entity);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//4.数据库更新操作:更新和删除
|
||||
var isSuccess = true;
|
||||
if (delete_entitys_ids.Count != 0)
|
||||
{
|
||||
isSuccess = await _boxInventoryRepositories.DeleteRange(delete_entitys_ids, 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>
|
||||
/// 处理箱库存变更:出入库
|
||||
|
||||
Reference in New Issue
Block a user