优化
This commit is contained in:
@@ -268,23 +268,23 @@ namespace WMS.Web.Domain.Services
|
|||||||
updateInStockTaskRequest.Boxs.Add(task_box);
|
updateInStockTaskRequest.Boxs.Add(task_box);
|
||||||
}
|
}
|
||||||
|
|
||||||
//2.修改后返回当前实体
|
//1.2.修改入库任务单
|
||||||
var update_result = await this.Update(updateInStockTaskRequest, loginInfo.UserInfo.StaffId, null, isTransaction, true);
|
var update_result = await this.Update(updateInStockTaskRequest, loginInfo.UserInfo.StaffId, null, isTransaction, true);
|
||||||
if (!update_result.IsSuccess)
|
if (!update_result.IsSuccess)
|
||||||
return update_result;
|
return update_result;
|
||||||
|
|
||||||
//执行保存
|
//2.入库单生成
|
||||||
var entity = new InStock();
|
var entity = new InStock();
|
||||||
entity.Type = update_result.Data.Type;
|
entity.Type = update_result.Data.Type;
|
||||||
entity.Details = _mapper.Map<List<InStockDetails>>(dto.Details);
|
entity.Details = _mapper.Map<List<InStockDetails>>(dto.Details);
|
||||||
entity.Create(loginInfo.UserInfo.StaffId);
|
entity.Create(loginInfo.UserInfo.StaffId);
|
||||||
|
|
||||||
//添加入库单信息
|
//2.1保存入库单信息
|
||||||
entity = await _inStockRepositories.Add(entity, isTransaction);
|
entity = await _inStockRepositories.Add(entity, isTransaction);
|
||||||
if(entity==null)
|
if(entity==null)
|
||||||
return Result.ReFailure(ResultCodes.DateWriteError);
|
return Result.ReFailure(ResultCodes.DateWriteError);
|
||||||
|
|
||||||
//当按产品上架:就要调用改箱的操作;
|
//2.2当按产品上架:就要调用改箱的操作;
|
||||||
if (dto.ShelfMethod == (int)ShelfMethod.Product)
|
if (dto.ShelfMethod == (int)ShelfMethod.Product)
|
||||||
{
|
{
|
||||||
var changeBox = new SaveChangeBoxRecordRequest();
|
var changeBox = new SaveChangeBoxRecordRequest();
|
||||||
@@ -302,12 +302,13 @@ namespace WMS.Web.Domain.Services
|
|||||||
return changeBoxSave_Result;
|
return changeBoxSave_Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//保存成功后:序列号跟踪流程添加;备注:和上面的改箱操作后会记录序列号轨迹不冲突;
|
//2.3序列号跟踪流程添加;备注:和上面的改箱操作后会记录序列号轨迹不冲突;
|
||||||
var serialNumber_result = await _serialNumberService.InStock(entity, loginInfo, isTransaction);
|
var serialNumber_result = await _serialNumberService.InStock(entity, loginInfo, isTransaction);
|
||||||
if (!serialNumber_result.IsSuccess)
|
if (!serialNumber_result.IsSuccess)
|
||||||
return serialNumber_result;
|
return serialNumber_result;
|
||||||
|
|
||||||
//保存成功后:箱库存的变更
|
//3.箱库存的变更
|
||||||
|
//3.1组装头部
|
||||||
var boxInventoryGenerateDto = dto.Details.GroupBy(x => new { x.BoxId, x.StockCode, x.SubStockId }).Select(x => new BoxInventoryGenerateDto()
|
var boxInventoryGenerateDto = dto.Details.GroupBy(x => new { x.BoxId, x.StockCode, x.SubStockId }).Select(x => new BoxInventoryGenerateDto()
|
||||||
{
|
{
|
||||||
InventoryInOutMethod = dto.ShelfMethod == (int)ShelfMethod.Product?(int)InventoryInOutMethod.Box: (int)InventoryInOutMethod.Product,
|
InventoryInOutMethod = dto.ShelfMethod == (int)ShelfMethod.Product?(int)InventoryInOutMethod.Box: (int)InventoryInOutMethod.Product,
|
||||||
@@ -316,7 +317,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
StockCode = x.Key.StockCode,
|
StockCode = x.Key.StockCode,
|
||||||
SubStockId = x.Key.SubStockId
|
SubStockId = x.Key.SubStockId
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
//3.2组装明细
|
||||||
foreach (var item in dto.Details)
|
foreach (var item in dto.Details)
|
||||||
{
|
{
|
||||||
var current = boxInventoryGenerateDto.Where(x => x.BoxId == item.BoxId).FirstOrDefault();
|
var current = boxInventoryGenerateDto.Where(x => x.BoxId == item.BoxId).FirstOrDefault();
|
||||||
@@ -329,6 +330,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
current.Details.Add(detail);
|
current.Details.Add(detail);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//3.3执行处理箱库存
|
||||||
var boxInventoryResult = await _boxInventoryService.HandlBoxInventory(boxInventoryGenerateDto, isTransaction);
|
var boxInventoryResult = await _boxInventoryService.HandlBoxInventory(boxInventoryGenerateDto, isTransaction);
|
||||||
if (!boxInventoryResult.IsSuccess)
|
if (!boxInventoryResult.IsSuccess)
|
||||||
return boxInventoryResult;
|
return boxInventoryResult;
|
||||||
|
|||||||
Reference in New Issue
Block a user