zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改 发料

Agv分支2024-11-19
郑勃旭 5 months ago
parent
28af0da568
commit
42402a5846
1 changed files with 173 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 331
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

331
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
View File

@ -7,6 +7,7 @@ using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Threading.Tasks; using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter; using Castle.Components.DictionaryAdapter;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Office2016.Excel; using DocumentFormat.OpenXml.Office2016.Excel;
using DocumentFormat.OpenXml.Spreadsheet; using DocumentFormat.OpenXml.Spreadsheet;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -892,168 +893,182 @@ public class AssembleIssueJobAppService
[HttpPost("call-back-agv")] [HttpPost("call-back-agv")]
public async Task<AgvResultObject> CallBackAgvAsync(AgvRequestDto request) public async Task<AgvResultObject> CallBackAgvAsync(AgvRequestDto request)
{ {
var json = JsonSerializer.Serialize(request); using var unitOfWork = _unitOfWorkManager.Begin();
var flag = DateTime.Now.ToString("yyyyMMddHHmmss");
_logger.LogInformation($"{flag}接收到AGV确认单据内容:" + json);
#if DEBUG
#endif
var errors = new List<string>();
var first = request.Data.FirstOrDefault();
var job = await _repository.GetAsync(p => p.Number == first.OrderNum).ConfigureAwait(false);
var ret = new AgvResultObject var ret = new AgvResultObject
{ {
Code = "0", Code = "1",
Message = "OK", Message = "Json转换错误",
ReqCode = job.AssembleRequestNumber, ReqCode = "Json转换错误"
}; };
using var unitOfWork = _unitOfWorkManager.Begin();
try
{
if (request.Data.Count > 0)
{
var jobs = request.Data;
var numbers = jobs.Select(p => p.OrderNum);
var query = _repository.WithDetails()
.Where(p => numbers.Contains(p.Number) && p.JobStatus != EnumJobStatus.Done);
var entities = query.ToList();
if (entities.Count == 0)
{
errors.Add($"任务号{string.Join(",", numbers)}不存在!");
}
var dtos = ObjectMapper.Map<List<AssembleIssueJob>, List<AssembleIssueJobDTO>>(entities);
foreach (var itm in dtos) // try
{ // {
var arys = jobs.Where(p => p.OrderNum == itm.Number); // var json = JsonSerializer.Serialize(request);
var itmDetails = itm.Details.ToList(); // var flag = DateTime.Now.ToString("yyyyMMddHHmmss");
var details = new List<AssembleIssueJobDetailDTO>(); // _logger.LogInformation($"{flag}接收到AGV确认单据内容:" + json);
foreach (var detail in arys) //#if DEBUG
{
var fromloc = await _postionLocationAppService.GetByCodeAsync(detail.BeginPosition).ConfigureAwait(false); //#endif
if (fromloc == null)
{ // foreach (var agvRequestDetailDto in request.Data)
errors.Add($"来源起始点{detail.BeginPosition}没查到"); // {
} // var job = await _repository.FindAsync(p => p.Number == agvRequestDetailDto.OrderNum).ConfigureAwait(false);
// if (job == null)
LocationDTO fromlocation = null; // {
// ret.ReqCode = agvRequestDetailDto.OrderNum;
if (fromloc != null) // throw new UserFriendlyException($"未找到{agvRequestDetailDto.OrderNum}单号");
{ // }
fromlocation = await _locationAppService.GetByCodeAsync(fromloc.LocationCode).ConfigureAwait(false); // if (job.JobStatus != EnumJobStatus.WaitAgv)
} // {
if (fromlocation == null) // throw new UserFriendlyException($"{agvRequestDetailDto.OrderNum}单号的任务状态错误");
{ // }
errors.Add($"来源起始点{detail.BeginPosition}库位没查到"); // var postionLocationDtoFrom= await _postionLocationAppService.GetByCodeAsync(agvRequestDetailDto.BeginPosition).ConfigureAwait(false);
} // if (postionLocationDtoFrom == null)
// {
var toloc = await _postionLocationAppService.GetByCodeAsync(detail.EndPosition) // throw new UserFriendlyException($"{agvRequestDetailDto.BeginPosition}起始点位未找到");
.ConfigureAwait(false); // }
if (toloc == null) // var postionLocationDtoEnd=await _postionLocationAppService.GetByCodeAsync(agvRequestDetailDto.EndPosition).ConfigureAwait(false);
{ // if (postionLocationDtoEnd==null)
errors.Add($"结束点{detail.EndPosition}库位没查到"); // {
} // throw new UserFriendlyException($"{agvRequestDetailDto.EndPosition}目标点位未找到");
// }
LocationDTO tolocation = null; // }
if (toloc != null)
{
tolocation = await _locationAppService.GetByCodeAsync(toloc.LocationCode).ConfigureAwait(false); // var locationDeliveryDto = await _locationDeliveryAppService.GetByFromLocationCodeAndToLocationCodeAsync(
} // jobDetailInputdetail.RecommendFromLocationCode, jobDetailInputdetail.RecommendToLocationCode).ConfigureAwait(false);
if (tolocation == null)
{ // if (locationDeliveryDto != null && locationDeliveryDto.EnumLocationDeliveryType == EnumLocationDeliveryType.Agv)
errors.Add($"结束点{detail.EndPosition}库位没查到"); // {
}
// }
var item=await _itemBasicAppService.GetByCodeAsync(detail.MatCode).ConfigureAwait(false);
if (item == null)
{
errors.Add($"零件号{detail.MatCode}不存在!");
} // foreach (var itm in dtos)
var entity = itmDetails.FirstOrDefault(p => p.ItemCode == detail.MatCode); // {
if (entity == null) // var arys = jobs.Where(p => p.OrderNum == itm.Number);
{ // var itmDetails = itm.Details.ToList();
errors.Add($"零件号{detail.MatCode}不在任务明细内!"); // var details = new List<AssembleIssueJobDetailDTO>();
} // foreach (var detail in arys)
if (errors.Count > 0) // {
{
await unitOfWork.RollbackAsync().ConfigureAwait(false); // if (fromloc == null)
return ret = new AgvResultObject() // {
{ // errors.Add($"来源起始点{detail.BeginPosition}没查到");
Code = "-1", // }
ReqCode = "",
Message = string.Join(",", errors.ToArray()) // LocationDTO fromlocation = null;
};
} // if (fromloc != null)
var dto = new AssembleIssueJobDetailDTO(); // {
dto.InjectFrom(entity); // fromlocation = await _locationAppService.GetByCodeAsync(fromloc.LocationCode).ConfigureAwait(false);
dto.HandledToLocationCode = tolocation.Code; // }
dto.HandledToLocationGroup = tolocation.LocationGroupCode; // if (fromlocation == null)
dto.HandledToLocationArea = tolocation.AreaCode; // {
dto.HandledToLocationErpCode = tolocation.ErpLocationCode; // errors.Add($"来源起始点{detail.BeginPosition}库位没查到");
// }
dto.HandledToWarehouseCode = tolocation.WarehouseCode;
dto.HandledToQty = detail.MatQty; // var toloc = await _postionLocationAppService.GetByCodeAsync(detail.EndPosition)
// .ConfigureAwait(false);
// if (toloc == null)
// {
dto.HandledToLot = !string.IsNullOrEmpty(detail.BatchAttr07) ? detail.BatchAttr07 : entity.RecommendFromLot; // errors.Add($"结束点{detail.EndPosition}库位没查到");
dto.HandledToPackingCode = string.Empty; // }
dto.HandledFromWarehouseCode = fromlocation.WarehouseCode; // LocationDTO tolocation = null;
dto.HandledFromLocationCode = fromlocation.Code;
dto.HandledFromLocationGroup = fromlocation.LocationGroupCode; // if (toloc != null)
dto.HandledFromLocationArea = fromlocation.AreaCode; // {
dto.HandledFromLocationErpCode = fromlocation.ErpLocationCode; // tolocation = await _locationAppService.GetByCodeAsync(toloc.LocationCode).ConfigureAwait(false);
dto.HandledFromQty = detail.MatQty; // }
dto.HandledFromLot = !string.IsNullOrEmpty(detail.BatchAttr07) ? detail.BatchAttr07 : entity.RecommendToLot; // if (tolocation == null)
dto.HandledFromPackingCode = string.Empty; // {
details.Add(dto); // errors.Add($"结束点{detail.EndPosition}库位没查到");
await ExecuteDetailExtAsync(itm.Id, entity.Id, dto).ConfigureAwait(false); // }
}
// var item = await _itemBasicAppService.GetByCodeAsync(detail.MatCode).ConfigureAwait(false);
if (errors.Count > 0)
{ // if (item == null)
await unitOfWork.RollbackAsync().ConfigureAwait(false); // {
ret = new AgvResultObject() // errors.Add($"零件号{detail.MatCode}不存在!");
{ // }
Code = "-1", // var entity = itmDetails.FirstOrDefault(p => p.ItemCode == detail.MatCode);
ReqCode = "", // if (entity == null)
Message = string.Join(",", errors.ToArray()) // {
}; // errors.Add($"零件号{detail.MatCode}不在任务明细内!");
} // }
itm.Worker = "AGV"; // if (errors.Count > 0)
itm.Details = details; // {
// await unitOfWork.RollbackAsync().ConfigureAwait(false);
_logger.LogInformation($"{flag}接收Agv确认单据内容:" + json + "Agv任务完成"); // return ret = new AgvResultObject()
} // {
} // Code = "-1",
else // ReqCode = "",
{ // Message = string.Join(",", errors.ToArray())
errors.Add("Agv确认单据里无数据! \n"); // };
} // }
} // var dto = new AssembleIssueJobDetailDTO();
catch (Exception ex) // dto.InjectFrom(entity);
{ // dto.HandledToLocationCode = tolocation.Code;
ret = new AgvResultObject // dto.HandledToLocationGroup = tolocation.LocationGroupCode;
{ // dto.HandledToLocationArea = tolocation.AreaCode;
Code = "-1", // dto.HandledToLocationErpCode = tolocation.ErpLocationCode;
ReqCode = job.AssembleRequestNumber,
Message = ex.Message // dto.HandledToWarehouseCode = tolocation.WarehouseCode;
}; // dto.HandledToQty = detail.MatQty;
await unitOfWork.RollbackAsync().ConfigureAwait(false);
return ret;
}
// dto.HandledToLot = !string.IsNullOrEmpty(detail.BatchAttr07) ? detail.BatchAttr07 : entity.RecommendFromLot;
if (errors.Count > 0) // dto.HandledToPackingCode = string.Empty;
{
ret = new AgvResultObject // dto.HandledFromWarehouseCode = fromlocation.WarehouseCode;
{ // dto.HandledFromLocationCode = fromlocation.Code;
Code = "-1", // dto.HandledFromLocationGroup = fromlocation.LocationGroupCode;
Message = string.Join(",", errors.ToArray()), // dto.HandledFromLocationArea = fromlocation.AreaCode;
ReqCode = job.AssembleRequestNumber // dto.HandledFromLocationErpCode = fromlocation.ErpLocationCode;
}; // dto.HandledFromQty = detail.MatQty;
} // dto.HandledFromLot = !string.IsNullOrEmpty(detail.BatchAttr07) ? detail.BatchAttr07 : entity.RecommendToLot;
// dto.HandledFromPackingCode = string.Empty;
// details.Add(dto);
// await ExecuteDetailExtAsync(itm.Id, entity.Id, dto).ConfigureAwait(false);
// }
// if (errors.Count > 0)
// {
// await unitOfWork.RollbackAsync().ConfigureAwait(false);
// ret = new AgvResultObject()
// {
// Code = "-1",
// ReqCode = "",
// Message = string.Join(",", errors.ToArray())
// };
// }
// itm.Worker = "AGV";
// itm.Details = details;
// _logger.LogInformation($"{flag}接收Agv确认单据内容:" + json + "Agv任务完成");
// }
// }
// catch (Exception ex)
// {
// await unitOfWork.RollbackAsync().ConfigureAwait(false);
// return ret;
// }
// if (errors.Count > 0)
// {
// ret = new AgvResultObject
// {
// Code = "-1",
// Message = string.Join(",", errors.ToArray()),
// ReqCode = first.OrderNum
// };
// }
return ret; return ret;
} }

Write Preview
Loading…
Cancel
Save